Merge commit '19a2b58c32d56060a8167a2ad69bb942083ba4c1' from release-0.9.3-pre-rc
Change-Id: I9e0ca4288a38d6311ce3e6d4a71a41086f59a2bb
diff --git a/asterixdb/asterix-active/pom.xml b/asterixdb/asterix-active/pom.xml
index 5865cd1..6b0c381 100644
--- a/asterixdb/asterix-active/pom.xml
+++ b/asterixdb/asterix-active/pom.xml
@@ -31,6 +31,11 @@
<version>${project.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.asterix</groupId>
+ <artifactId>asterix-transactions</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hyracks</groupId>
<artifactId>hyracks-api</artifactId>
</dependency>
diff --git a/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java
new file mode 100644
index 0000000..070d838
--- /dev/null
+++ b/asterixdb/asterix-active/src/main/java/org/apache/asterix/active/DeployedJobService.java
@@ -0,0 +1,108 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.active;
+
+import java.time.Instant;
+import java.util.Date;
+import java.util.Map;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
+import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
+import org.apache.hyracks.api.job.JobId;
+
+/**
+ * Provides functionality for running DeployedJobSpecs
+ */
+public class DeployedJobService {
+
+ private static final Logger LOGGER = Logger.getLogger(DeployedJobService.class.getName());
+
+ //To enable new Asterix TxnId for separate deployed job spec invocations
+ private static final byte[] TRANSACTION_ID_PARAMETER_NAME = "TxnIdParameter".getBytes();
+
+ //pool size one (only running one thread at a time)
+ private static final int POOL_SIZE = 1;
+
+ //Starts running a deployed job specification periodically with an interval of "duration" seconds
+ public static ScheduledExecutorService startRepetitiveDeployedJobSpec(DeployedJobSpecId distributedId,
+ IHyracksClientConnection hcc, long duration, Map<byte[], byte[]> jobParameters, EntityId entityId) {
+ ScheduledExecutorService scheduledExecutorService = Executors.newScheduledThreadPool(POOL_SIZE);
+ scheduledExecutorService.scheduleAtFixedRate(new Runnable() {
+ @Override
+ public void run() {
+ try {
+ if (!runRepetitiveDeployedJobSpec(distributedId, hcc, jobParameters, duration, entityId)) {
+ scheduledExecutorService.shutdown();
+ }
+ } catch (Exception e) {
+ LOGGER.log(Level.SEVERE, "Job Failed to run for " + entityId.getExtensionName() + " "
+ + entityId.getDataverse() + "." + entityId.getEntityName() + ".", e);
+ }
+ }
+ }, duration, duration, TimeUnit.MILLISECONDS);
+ return scheduledExecutorService;
+ }
+
+ public static boolean runRepetitiveDeployedJobSpec(DeployedJobSpecId distributedId, IHyracksClientConnection hcc,
+ Map<byte[], byte[]> jobParameters, long duration, EntityId entityId) throws Exception {
+ long executionMilliseconds = runDeployedJobSpec(distributedId, hcc, jobParameters, entityId);
+ if (executionMilliseconds > duration && LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.log(Level.SEVERE,
+ "Periodic job for " + entityId.getExtensionName() + " " + entityId.getDataverse() + "."
+ + entityId.getEntityName() + " was unable to meet the required period of " + duration
+ + " milliseconds. Actually took " + executionMilliseconds + " execution will shutdown"
+ + new Date());
+ return false;
+ }
+ return true;
+ }
+
+ public synchronized static long runDeployedJobSpec(DeployedJobSpecId distributedId, IHyracksClientConnection hcc,
+ Map<byte[], byte[]> jobParameters, EntityId entityId) throws Exception {
+ JobId jobId;
+ long startTime = Instant.now().toEpochMilli();
+
+ //Add the Asterix Transaction Id to the map
+ jobParameters.put(TRANSACTION_ID_PARAMETER_NAME, String.valueOf(TxnIdFactory.create().getId()).getBytes());
+ jobId = hcc.startJob(distributedId, jobParameters);
+
+ hcc.waitForCompletion(jobId);
+ long executionMilliseconds = Instant.now().toEpochMilli() - startTime;
+
+ LOGGER.log(Level.INFO,
+ "Deployed Job execution completed for " + entityId.getExtensionName() + " " + entityId.getDataverse()
+ + "."
+ + entityId.getEntityName() + ". Took " + executionMilliseconds + " milliseconds ");
+
+ return executionMilliseconds;
+
+ }
+
+ @Override
+ public String toString() {
+ return "DeployedJobSpecService";
+ }
+
+}
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/ILangExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/ILangExpressionToPlanTranslator.java
index ca6710f..8e0214a 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/ILangExpressionToPlanTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/base/ILangExpressionToPlanTranslator.java
@@ -18,7 +18,6 @@
*/
package org.apache.asterix.algebra.base;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.lang.common.statement.Query;
import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -40,10 +39,9 @@
* the compiled dml statement (only for insert/delete).
* @return a logical query plan for the query.
* @throws AlgebricksException
- * @throws AsterixException
*/
public ILogicalPlan translate(Query query, String outputDatasetName, ICompiledDmlStatement stmt)
- throws AlgebricksException, AsterixException;
+ throws AlgebricksException;
/**
* Translates a load statement.
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
index 2dd4c3d..abd18aa 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/CommitPOperator.java
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -39,17 +39,16 @@
import org.apache.hyracks.algebricks.core.jobgen.impl.JobGenHelper;
import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory;
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
-import org.apache.hyracks.api.io.FileSplit;
public class CommitPOperator extends AbstractPhysicalOperator {
private final List<LogicalVariable> primaryKeyLogicalVars;
- private final JobId jobId;
+ private final TxnId txnId;
private final Dataset dataset;
private final boolean isSink;
- public CommitPOperator(JobId jobId, Dataset dataset, List<LogicalVariable> primaryKeyLogicalVars, boolean isSink) {
- this.jobId = jobId;
+ public CommitPOperator(TxnId txnId, Dataset dataset, List<LogicalVariable> primaryKeyLogicalVars, boolean isSink) {
+ this.txnId = txnId;
this.dataset = dataset;
this.primaryKeyLogicalVars = primaryKeyLogicalVars;
this.isSink = isSink;
@@ -88,7 +87,7 @@
int[] primaryKeyFields = JobGenHelper.variablesToFieldIndexes(primaryKeyLogicalVars, inputSchemas[0]);
//get dataset splits
- IPushRuntimeFactory runtime = dataset.getCommitRuntimeFactory(metadataProvider, jobId, primaryKeyFields,
+ IPushRuntimeFactory runtime = dataset.getCommitRuntimeFactory(metadataProvider, txnId, primaryKeyFields,
isSink);
builder.contributeMicroOperator(op, runtime, recDesc);
ILogicalOperator src = op.getInputs().get(0).getValue();
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
index cd0a63c..c941320 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/algebra/operators/physical/InvertedIndexPOperator.java
@@ -18,7 +18,6 @@
*/
package org.apache.asterix.algebra.operators.physical;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.metadata.declared.DataSourceId;
import org.apache.asterix.metadata.declared.MetadataProvider;
@@ -100,19 +99,15 @@
jobGenParams.readFromFuncArgs(unnestFuncExpr.getArguments());
MetadataProvider metadataProvider = (MetadataProvider) context.getMetadataProvider();
- Dataset dataset;
- try {
- dataset = metadataProvider.findDataset(jobGenParams.getDataverseName(), jobGenParams.getDatasetName());
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ Dataset dataset = metadataProvider.findDataset(jobGenParams.getDataverseName(), jobGenParams.getDatasetName());
int[] keyIndexes = getKeyIndexes(jobGenParams.getKeyVarList(), inputSchemas);
int[] minFilterFieldIndexes = getKeyIndexes(unnestMapOp.getMinFilterVars(), inputSchemas);
int[] maxFilterFieldIndexes = getKeyIndexes(unnestMapOp.getMaxFilterVars(), inputSchemas);
boolean retainNull = false;
if (op.getOperatorTag() == LogicalOperatorTag.LEFT_OUTER_UNNEST_MAP) {
- // By nature, LEFT_OUTER_UNNEST_MAP should generate null values for non-matching tuples.
+ // By nature, LEFT_OUTER_UNNEST_MAP should generate null values for non-matching
+ // tuples.
retainNull = true;
}
// Build runtime.
@@ -135,46 +130,38 @@
AbstractUnnestMapOperator unnestMap, IOperatorSchema opSchema, boolean retainInput, boolean retainMissing,
String datasetName, Dataset dataset, String indexName, ATypeTag searchKeyType, int[] keyFields,
SearchModifierType searchModifierType, IAlgebricksConstantValue similarityThreshold,
- int[] minFilterFieldIndexes, int[] maxFilterFieldIndexes,
- boolean isFullTextSearchQuery) throws AlgebricksException {
- try {
-
- boolean propagateIndexFilter = unnestMap.propagateIndexFilter();
- IAObject simThresh = ((AsterixConstantValue) similarityThreshold).getObject();
- int numPrimaryKeys = dataset.getPrimaryKeys().size();
- Index secondaryIndex = MetadataManager.INSTANCE
- .getIndex(metadataProvider.getMetadataTxnContext(), dataset.getDataverseName(),
- dataset.getDatasetName(), indexName);
- if (secondaryIndex == null) {
- throw new AlgebricksException(
- "Code generation error: no index " + indexName + " for dataset " + datasetName);
- }
- IVariableTypeEnvironment typeEnv = context.getTypeEnvironment(unnestMap);
- RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> secondarySplitsAndConstraint =
- metadataProvider.getSplitProviderAndConstraints(dataset, indexName);
- // TODO: Here we assume there is only one search key field.
- int queryField = keyFields[0];
- // Get tokenizer and search modifier factories.
- IInvertedIndexSearchModifierFactory searchModifierFactory =
- InvertedIndexAccessMethod.getSearchModifierFactory(searchModifierType, simThresh, secondaryIndex);
- IBinaryTokenizerFactory queryTokenizerFactory = InvertedIndexAccessMethod
- .getBinaryTokenizerFactory(searchModifierType, searchKeyType, secondaryIndex);
- IIndexDataflowHelperFactory dataflowHelperFactory =
- new IndexDataflowHelperFactory(metadataProvider.getStorageComponentProvider().getStorageManager(),
- secondarySplitsAndConstraint.first);
- LSMInvertedIndexSearchOperatorDescriptor invIndexSearchOp =
- new LSMInvertedIndexSearchOperatorDescriptor(jobSpec, outputRecDesc, queryField,
- dataflowHelperFactory, queryTokenizerFactory, searchModifierFactory, retainInput,
- retainMissing, context.getMissingWriterFactory(),
- dataset.getSearchCallbackFactory(metadataProvider.getStorageComponentProvider(),
- secondaryIndex,
- ((JobEventListenerFactory) jobSpec.getJobletEventListenerFactory()).getJobId(),
- IndexOperation.SEARCH, null), minFilterFieldIndexes, maxFilterFieldIndexes,
- isFullTextSearchQuery, numPrimaryKeys, propagateIndexFilter);
- return new Pair<>(invIndexSearchOp, secondarySplitsAndConstraint.second);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
+ int[] minFilterFieldIndexes, int[] maxFilterFieldIndexes, boolean isFullTextSearchQuery)
+ throws AlgebricksException {
+ boolean propagateIndexFilter = unnestMap.propagateIndexFilter();
+ IAObject simThresh = ((AsterixConstantValue) similarityThreshold).getObject();
+ int numPrimaryKeys = dataset.getPrimaryKeys().size();
+ Index secondaryIndex = MetadataManager.INSTANCE.getIndex(metadataProvider.getMetadataTxnContext(),
+ dataset.getDataverseName(), dataset.getDatasetName(), indexName);
+ if (secondaryIndex == null) {
+ throw new AlgebricksException(
+ "Code generation error: no index " + indexName + " for dataset " + datasetName);
}
+ IVariableTypeEnvironment typeEnv = context.getTypeEnvironment(unnestMap);
+ RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> secondarySplitsAndConstraint =
+ metadataProvider.getSplitProviderAndConstraints(dataset, indexName);
+ // TODO: Here we assume there is only one search key field.
+ int queryField = keyFields[0];
+ // Get tokenizer and search modifier factories.
+ IInvertedIndexSearchModifierFactory searchModifierFactory =
+ InvertedIndexAccessMethod.getSearchModifierFactory(searchModifierType, simThresh, secondaryIndex);
+ IBinaryTokenizerFactory queryTokenizerFactory =
+ InvertedIndexAccessMethod.getBinaryTokenizerFactory(searchModifierType, searchKeyType, secondaryIndex);
+ IIndexDataflowHelperFactory dataflowHelperFactory = new IndexDataflowHelperFactory(
+ metadataProvider.getStorageComponentProvider().getStorageManager(), secondarySplitsAndConstraint.first);
+ LSMInvertedIndexSearchOperatorDescriptor invIndexSearchOp = new LSMInvertedIndexSearchOperatorDescriptor(
+ jobSpec, outputRecDesc, queryField, dataflowHelperFactory, queryTokenizerFactory, searchModifierFactory,
+ retainInput, retainMissing, context.getMissingWriterFactory(),
+ dataset.getSearchCallbackFactory(metadataProvider.getStorageComponentProvider(), secondaryIndex,
+ ((JobEventListenerFactory) jobSpec.getJobletEventListenerFactory()).getTxnId(),
+ IndexOperation.SEARCH, null),
+ minFilterFieldIndexes, maxFilterFieldIndexes, isFullTextSearchQuery, numPrimaryKeys,
+ propagateIndexFilter);
+ return new Pair<>(invIndexSearchOp, secondarySplitsAndConstraint.second);
}
}
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
index a8d9ec0..5146993 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/base/RuleCollections.java
@@ -79,6 +79,7 @@
import org.apache.asterix.optimizer.rules.UnnestToDataScanRule;
import org.apache.asterix.optimizer.rules.am.IntroduceJoinAccessMethodRule;
import org.apache.asterix.optimizer.rules.am.IntroduceLSMComponentFilterRule;
+import org.apache.asterix.optimizer.rules.am.IntroducePrimaryIndexForAggregationRule;
import org.apache.asterix.optimizer.rules.am.IntroduceSelectAccessMethodRule;
import org.apache.asterix.optimizer.rules.subplan.AsterixMoveFreeVariableOperatorOutOfSubplanRule;
import org.apache.asterix.optimizer.rules.subplan.InlineSubplanInputForNestedTupleSourceRule;
@@ -284,6 +285,7 @@
accessMethod.add(new IntroduceSelectAccessMethodRule());
accessMethod.add(new IntroduceJoinAccessMethodRule());
accessMethod.add(new IntroduceLSMComponentFilterRule());
+ accessMethod.add(new IntroducePrimaryIndexForAggregationRule());
accessMethod.add(new IntroduceSecondaryIndexInsertDeleteRule());
accessMethod.add(new RemoveUnusedOneToOneEquiJoinRule());
accessMethod.add(new PushSimilarityFunctionsBelowJoin());
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java
index 42cea34..8bd3d79 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FullTextContainsParameterCheckRule.java
@@ -19,9 +19,10 @@
package org.apache.asterix.optimizer.rules;
import java.util.ArrayList;
-import java.util.HashMap;
import java.util.List;
+import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.om.base.AString;
import org.apache.asterix.om.constants.AsterixConstantValue;
import org.apache.asterix.om.functions.BuiltinFunctions;
@@ -36,12 +37,12 @@
import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractLogicalExpression;
import org.apache.hyracks.algebricks.core.algebra.expressions.ConstantExpression;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
-import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractBinaryJoinOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
-import org.apache.hyracks.algebricks.core.algebra.operators.logical.SelectOperator;
import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
+import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionReferenceTransform;
import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
/**
@@ -49,38 +50,16 @@
*/
public class FullTextContainsParameterCheckRule implements IAlgebraicRewriteRule {
- // parameter name and its value
- HashMap<MutableObject<ILogicalExpression>, MutableObject<ILogicalExpression>> paramValueMap;
-
- // the last expression position before the option argument in the arguments array
- private static final int LAST_EXPRESSION_POS_BEFORE_OPTION = 1;
- // The number of anticipated arguments for a full-text query when a user doesn't provide any option.
- private static final int FULLTEXT_QUERY_WITHOUT_OPTION_NO_OF_ARGUMENTS = 2;
- // The number of anticipated arguments for a full-text query when a user provide option(s) as a record.
- private static final int FULLTEXT_QUERY_WITH_OPTION_NO_OF_ARGUMENTS = 3;
+ // Visitor for checking and transforming ftcontains() expression
+ protected FullTextContainsExpressionVisitor ftcontainsExprVisitor = new FullTextContainsExpressionVisitor();
@Override
- public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
throws AlgebricksException {
- AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
- Mutable<ILogicalExpression> exprRef;
- switch (op.getOperatorTag()) {
- case SELECT:
- exprRef = ((SelectOperator) op).getCondition();
- break;
- case INNERJOIN:
- case LEFTOUTERJOIN:
- exprRef = ((AbstractBinaryJoinOperator) op).getCondition();
- break;
- default:
- return false;
- }
-
- if (context.checkIfInDontApplySet(this, op)) {
+ if (context.checkIfInDontApplySet(this, opRef.getValue())) {
return false;
}
-
- if (checkParamter(op, exprRef, context)) {
+ if (checkParameter(opRef, context)) {
OperatorPropertiesUtil.typeOpRec(opRef, context);
return true;
}
@@ -91,199 +70,234 @@
* Check the correctness of the parameters of the ftcontains(). Also rearrange options as arguments.
* The expected form of ftcontains() is ftcontains(expression1, expression2, parameters as a record).
*/
- private boolean checkParamter(ILogicalOperator op, Mutable<ILogicalExpression> exprRef,
- IOptimizationContext context) throws AlgebricksException {
- ILogicalExpression expr = exprRef.getValue();
+ private boolean checkParameter(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ AbstractLogicalOperator op = (AbstractLogicalOperator) opRef.getValue();
+ boolean modified = op.acceptExpressionTransform(ftcontainsExprVisitor);
+ if (modified) {
+ context.addToDontApplySet(this, op);
+ }
+ return modified;
+ }
- if (expr.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
+
+ /**
+ * This visitor class handles actual checking and transformation.
+ */
+ protected class FullTextContainsExpressionVisitor implements ILogicalExpressionReferenceTransform {
+
+ // the last expression position before the option argument in the arguments array
+ private static final int LAST_EXPRESSION_POS_BEFORE_OPTION = 1;
+ // The number of anticipated arguments for a full-text query when a user doesn't provide any option.
+ private static final int FULLTEXT_QUERY_WITHOUT_OPTION_NO_OF_ARGUMENTS = 2;
+ // The number of anticipated arguments for a full-text query when a user provide option(s) as a record.
+ private static final int FULLTEXT_QUERY_WITH_OPTION_NO_OF_ARGUMENTS = 3;
+
+ public FullTextContainsExpressionVisitor() {
+ // no parameter is needed.
+ }
+
+ @Override
+ public boolean transform(Mutable<ILogicalExpression> exprRef) throws AlgebricksException {
+ ILogicalExpression e = exprRef.getValue();
+ switch (((AbstractLogicalExpression) e).getExpressionTag()) {
+ case FUNCTION_CALL:
+ return transformFunctionCallExpression((AbstractFunctionCallExpression) e);
+ default:
+ return false;
+ }
+ }
+
+ private boolean transformFunctionCallExpression(AbstractFunctionCallExpression fce) throws AlgebricksException {
+ boolean modified = false;
+ FunctionIdentifier fi = fce.getFunctionIdentifier();
+ if (fi != BuiltinFunctions.FULLTEXT_CONTAINS && fi != BuiltinFunctions.FULLTEXT_CONTAINS_WO_OPTION) {
+ for (Mutable<ILogicalExpression> arg : fce.getArguments()) {
+ if (transform(arg)) {
+ modified = true;
+ }
+ }
+ } else {
+ modified = checkParameterForFuncExpr(fce, fi);
+ }
+
+ return modified;
+ }
+
+ private boolean checkParameterForFuncExpr(AbstractFunctionCallExpression funcExpr, FunctionIdentifier fi)
+ throws AlgebricksException {
+ // Collects the correct number of arguments - it can be 2 if a user doesn't provide any option.
+ int numberOfCorrectArguments = 0;
+ String functionName = "";
+ if (fi == BuiltinFunctions.FULLTEXT_CONTAINS) {
+ numberOfCorrectArguments = FULLTEXT_QUERY_WITH_OPTION_NO_OF_ARGUMENTS;
+ functionName = BuiltinFunctions.FULLTEXT_CONTAINS.getName();
+ } else if (fi == BuiltinFunctions.FULLTEXT_CONTAINS_WO_OPTION) {
+ numberOfCorrectArguments = FULLTEXT_QUERY_WITHOUT_OPTION_NO_OF_ARGUMENTS;
+ functionName = BuiltinFunctions.FULLTEXT_CONTAINS_WO_OPTION.getName();
+ }
+
+ // If numberOfCorrectArguments is greater than zero, then this is a full-text search query.
+ if (numberOfCorrectArguments > 0) {
+
+ List<Mutable<ILogicalExpression>> oldExprs = funcExpr.getArguments();
+ List<Mutable<ILogicalExpression>> newExprs = new ArrayList<>();
+
+ // The number of parameters should be three: exp1, exp2, and the option
+ if (oldExprs.size() != numberOfCorrectArguments) {
+ throw CompilationException.create(ErrorCode.COMPILATION_INVALID_PARAMETER_NUMBER, fi,
+ oldExprs.size());
+ }
+
+ // The last expression before the option needs to be copied first.
+ for (int i = 0; i <= LAST_EXPRESSION_POS_BEFORE_OPTION; i++) {
+ newExprs.add(new MutableObject<ILogicalExpression>(oldExprs.get(i).getValue()));
+ }
+
+ // Sanity check for the types of the first two parameters
+ checkFirstAndSecondParamter(oldExprs, functionName);
+
+ // Checks and transforms the actual full-text parameters.
+ if (numberOfCorrectArguments == FULLTEXT_QUERY_WITH_OPTION_NO_OF_ARGUMENTS) {
+ checkValueForThirdParameter(oldExprs.get(2), newExprs, functionName);
+ } else {
+ // no option provided case: sets the default option here.
+ setDefaultValueForThirdParameter(newExprs);
+ }
+
+ // Resets the last argument.
+ funcExpr.getArguments().clear();
+ funcExpr.getArguments().addAll(newExprs);
+
+ return true;
+ }
+
return false;
}
- AbstractFunctionCallExpression funcExpr = (AbstractFunctionCallExpression) expr;
- FunctionIdentifier fi = funcExpr.getFunctionIdentifier();
-
- // Collects the correct number of arguments - it can be 2 if a user doesn't provide any option.
- int numberOfCorrectArguments = 0;
- String functionName = "";
- if (fi == BuiltinFunctions.FULLTEXT_CONTAINS) {
- numberOfCorrectArguments = FULLTEXT_QUERY_WITH_OPTION_NO_OF_ARGUMENTS;
- functionName = BuiltinFunctions.FULLTEXT_CONTAINS.getName();
- } else if (fi == BuiltinFunctions.FULLTEXT_CONTAINS_WO_OPTION) {
- numberOfCorrectArguments = FULLTEXT_QUERY_WITHOUT_OPTION_NO_OF_ARGUMENTS;
- functionName = BuiltinFunctions.FULLTEXT_CONTAINS_WO_OPTION.getName();
- }
-
- // If numberOfCorrectArguments is greater than zero, then this is a full-text search query.
- if (numberOfCorrectArguments > 0) {
- // Don't need to check this operator again.
- context.addToDontApplySet(this, op);
-
- List<Mutable<ILogicalExpression>> oldExprs = funcExpr.getArguments();
- List<Mutable<ILogicalExpression>> newExprs = new ArrayList<>();
-
- // The number of parameters should be three: exp1, exp2, and the option
- if (oldExprs.size() != numberOfCorrectArguments) {
- throw new AlgebricksException(
- functionName + " should have " + numberOfCorrectArguments + " parameters.");
+ /**
+ * Checks the correctness of the first and second argument. If the argument is a constant, we can check
+ * it now. If the argument is not a constant, we will defer the checking until run-time.
+ */
+ private void checkFirstAndSecondParamter(List<Mutable<ILogicalExpression>> exprs, String functionName)
+ throws AlgebricksException {
+ // Check the first parameter - Expression1. If it's a constant, then we can check the type here.
+ ILogicalExpression firstExpr = exprs.get(0).getValue();
+ if (firstExpr.getExpressionTag() == LogicalExpressionTag.CONSTANT
+ && ConstantExpressionUtil.getConstantIaObjectType(firstExpr) != ATypeTag.STRING) {
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName,
+ ConstantExpressionUtil.getConstantIaObjectType(firstExpr));
}
- // The last expression before the option needs to be copied first.
- for (int i = 0; i <= LAST_EXPRESSION_POS_BEFORE_OPTION; i++) {
- newExprs.add(new MutableObject<ILogicalExpression>((ILogicalExpression) oldExprs.get(i).getValue()));
- }
-
- // Sanity check for the types of the first two parameters
- checkFirstAndSecondParamter(oldExprs, functionName);
-
- // Checks and transforms the actual full-text parameters.
- if (numberOfCorrectArguments == FULLTEXT_QUERY_WITH_OPTION_NO_OF_ARGUMENTS) {
- checkValueForThirdParameter(oldExprs.get(2), newExprs);
- } else {
- // no option provided case: sets the default option here.
- setDefaultValueForThirdParameter(newExprs);
- }
-
- // Resets the last argument.
- funcExpr.getArguments().clear();
- funcExpr.getArguments().addAll(newExprs);
-
- return true;
- }
-
- return false;
- }
-
- /**
- * Checks the correctness of the first and second argument. If the argument is a constant, we can check
- * it now. If the argument is not a constant, we will defer the checking until run-time.
- */
- void checkFirstAndSecondParamter(List<Mutable<ILogicalExpression>> exprs, String functionName)
- throws AlgebricksException {
- // Check the first parameter - Expression1. If it's a constant, then we can check the type here.
- ILogicalExpression firstExpr = exprs.get(0).getValue();
- if (firstExpr.getExpressionTag() == LogicalExpressionTag.CONSTANT
- && ConstantExpressionUtil.getConstantIaObjectType(firstExpr) != ATypeTag.STRING) {
- throw new AlgebricksException("The first expression of " + functionName + " should be a string.");
- }
-
- // Check the second parameter - Expression2. If it's a constant, then we can check the type here.
- ILogicalExpression secondExpr = exprs.get(1).getValue();
- if (secondExpr.getExpressionTag() == LogicalExpressionTag.CONSTANT) {
- ATypeTag exprTypeTag = ConstantExpressionUtil.getConstantIaObjectType(secondExpr);
- switch (exprTypeTag) {
- case STRING:
- case MULTISET:
- case ARRAY:
- break;
- default:
- throw new AlgebricksException("The second expression of " + functionName
- + "should be a string, an unordered list, or an ordered list.");
- }
- }
- }
-
- /**
- * Checks the option of the given ftcontains() function. Also, sets default value.
- *
- * @param expr
- * @throws AlgebricksException
- */
- void checkValueForThirdParameter(Mutable<ILogicalExpression> expr,
- List<Mutable<ILogicalExpression>> newArgs) throws AlgebricksException {
- // Get the last parameter - this should be a record-constructor.
- AbstractFunctionCallExpression openRecConsExpr = (AbstractFunctionCallExpression) expr.getValue();
- FunctionIdentifier openRecConsFi = openRecConsExpr.getFunctionIdentifier();
- if (openRecConsFi != BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR
- && openRecConsFi != BuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR) {
- throw new AlgebricksException("ftcontains() option should be the form of a record { }.");
- }
-
- // We multiply 2 because the layout of the arguments are: [expr, val, expr1, val1, ...]
- if (openRecConsExpr.getArguments().size() > FullTextContainsDescriptor.getParamTypeMap().size() * 2) {
- throw new AlgebricksException("Too many options were specified.");
- }
-
- for (int i = 0; i < openRecConsExpr.getArguments().size(); i = i + 2) {
- ILogicalExpression optionExpr = openRecConsExpr.getArguments().get(i).getValue();
- ILogicalExpression optionExprVal = openRecConsExpr.getArguments().get(i + 1).getValue();
-
- if (optionExpr.getExpressionTag() != LogicalExpressionTag.CONSTANT) {
- throw new AlgebricksException(
- "Options must be in the form of constant strings. Check that the option at " + (i % 2 + 1)
- + " is indeed a constant string");
- }
-
- String option = ConstantExpressionUtil.getStringArgument(openRecConsExpr, i).toLowerCase();
- if (!FullTextContainsDescriptor.getParamTypeMap().containsKey(option)) {
- throw new AlgebricksException(
- "The given option " + option + " is not a valid argument to ftcontains()");
- }
-
- boolean typeError = false;
- String optionTypeStringVal = null;
-
- // If the option value is a constant, then we can check here.
- if (optionExprVal.getExpressionTag() == LogicalExpressionTag.CONSTANT) {
- switch (FullTextContainsDescriptor.getParamTypeMap().get(option)) {
+ // Check the second parameter - Expression2. If it's a constant, then we can check the type here.
+ ILogicalExpression secondExpr = exprs.get(1).getValue();
+ if (secondExpr.getExpressionTag() == LogicalExpressionTag.CONSTANT) {
+ ATypeTag exprTypeTag = ConstantExpressionUtil.getConstantIaObjectType(secondExpr);
+ switch (exprTypeTag) {
case STRING:
- optionTypeStringVal = ConstantExpressionUtil.getStringArgument(openRecConsExpr, i + 1)
- .toLowerCase();
- if (optionTypeStringVal == null) {
- typeError = true;
- }
+ case MULTISET:
+ case ARRAY:
break;
default:
- // Currently, we only have a string parameter. So, the flow doesn't reach here.
- typeError = true;
- break;
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, exprTypeTag);
}
}
+ }
- if (typeError) {
- throw new AlgebricksException(
- "The given value for option " + option + " was not of the expected type");
+ /**
+ * Checks the option of the given ftcontains() function. Also, sets default value.
+ *
+ * @param expr
+ * @throws AlgebricksException
+ */
+ private void checkValueForThirdParameter(Mutable<ILogicalExpression> expr,
+ List<Mutable<ILogicalExpression>> newArgs, String functionName) throws AlgebricksException {
+ // Get the last parameter - this should be a record-constructor.
+ AbstractFunctionCallExpression openRecConsExpr = (AbstractFunctionCallExpression) expr.getValue();
+ FunctionIdentifier openRecConsFi = openRecConsExpr.getFunctionIdentifier();
+ if (openRecConsFi != BuiltinFunctions.OPEN_RECORD_CONSTRUCTOR
+ && openRecConsFi != BuiltinFunctions.CLOSED_RECORD_CONSTRUCTOR) {
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, openRecConsFi);
}
- // Check the validity of option value
- switch (option) {
- case FullTextContainsDescriptor.SEARCH_MODE_OPTION:
- checkSearchModeOption(optionTypeStringVal);
- break;
- default:
- break;
+ // We multiply 2 because the layout of the arguments are: [expr, val, expr1, val1, ...]
+ if (openRecConsExpr.getArguments().size() > FullTextContainsDescriptor.getParamTypeMap().size() * 2) {
+ throw CompilationException.create(ErrorCode.TOO_MANY_OPTIONS_FOR_FUNCTION, functionName);
}
+ for (int i = 0; i < openRecConsExpr.getArguments().size(); i = i + 2) {
+ ILogicalExpression optionExpr = openRecConsExpr.getArguments().get(i).getValue();
+ ILogicalExpression optionExprVal = openRecConsExpr.getArguments().get(i + 1).getValue();
+
+ String option = ConstantExpressionUtil.getStringConstant(optionExpr);
+
+ if (optionExpr.getExpressionTag() != LogicalExpressionTag.CONSTANT || option == null) {
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName,
+ optionExpr.getExpressionTag());
+ }
+
+ option = option.toLowerCase();
+ if (!FullTextContainsDescriptor.getParamTypeMap().containsKey(option)) {
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, option);
+ }
+
+ String optionTypeStringVal = null;
+
+ // If the option value is a constant, then we can check here.
+ if (optionExprVal.getExpressionTag() == LogicalExpressionTag.CONSTANT) {
+ switch (FullTextContainsDescriptor.getParamTypeMap().get(option)) {
+ case STRING:
+ optionTypeStringVal = ConstantExpressionUtil.getStringConstant(optionExprVal);
+ if (optionTypeStringVal == null) {
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, option);
+ }
+ optionTypeStringVal = optionTypeStringVal.toLowerCase();
+ break;
+ default:
+ // Currently, we only have a string parameter. So, the flow doesn't reach here.
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, option);
+ }
+
+ // Check the validity of option value
+ switch (option) {
+ case FullTextContainsDescriptor.SEARCH_MODE_OPTION:
+ checkSearchModeOption(optionTypeStringVal, functionName);
+ break;
+ default:
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, option);
+ }
+ }
+
+ // Add this option as arguments to the ftcontains().
+ newArgs.add(new MutableObject<ILogicalExpression>(optionExpr));
+ newArgs.add(new MutableObject<ILogicalExpression>(optionExprVal));
+ }
+ }
+
+ private void checkSearchModeOption(String optionVal, String functionName) throws AlgebricksException {
+ if (optionVal.equals(FullTextContainsDescriptor.CONJUNCTIVE_SEARCH_MODE_OPTION)
+ || optionVal.equals(FullTextContainsDescriptor.DISJUNCTIVE_SEARCH_MODE_OPTION)) {
+ return;
+ } else {
+ throw CompilationException.create(ErrorCode.TYPE_UNSUPPORTED, functionName, optionVal);
+ }
+ }
+
+ /**
+ * Sets the default option value(s) when a user doesn't provide any option.
+ */
+ void setDefaultValueForThirdParameter(List<Mutable<ILogicalExpression>> newArgs) throws AlgebricksException {
+ // Sets the search mode option: the default option is conjunctive search.
+ ILogicalExpression searchModeOptionExpr = new ConstantExpression(
+ new AsterixConstantValue(new AString(FullTextContainsDescriptor.SEARCH_MODE_OPTION)));
+ ILogicalExpression searchModeValExpr = new ConstantExpression(
+ new AsterixConstantValue(new AString(FullTextContainsDescriptor.CONJUNCTIVE_SEARCH_MODE_OPTION)));
+
// Add this option as arguments to the ftcontains().
- newArgs.add(new MutableObject<ILogicalExpression>(optionExpr));
- newArgs.add(new MutableObject<ILogicalExpression>(optionExprVal));
+ newArgs.add(new MutableObject<ILogicalExpression>(searchModeOptionExpr));
+ newArgs.add(new MutableObject<ILogicalExpression>(searchModeValExpr));
}
- }
- void checkSearchModeOption(String optionVal) throws AlgebricksException {
- if (optionVal.equals(FullTextContainsDescriptor.CONJUNCTIVE_SEARCH_MODE_OPTION)
- || optionVal.equals(FullTextContainsDescriptor.DISJUNCTIVE_SEARCH_MODE_OPTION)) {
- return;
- } else {
- throw new AlgebricksException("The given value for the search mode (" + optionVal
- + ") is not valid. Valid modes are " + FullTextContainsDescriptor.CONJUNCTIVE_SEARCH_MODE_OPTION
- + " or " + FullTextContainsDescriptor.DISJUNCTIVE_SEARCH_MODE_OPTION + ".");
- }
- }
-
- /**
- * Sets the default option value(s) when a user doesn't provide any option.
- */
- void setDefaultValueForThirdParameter(List<Mutable<ILogicalExpression>> newArgs)
- throws AlgebricksException {
- // Sets the search mode option: the default option is conjunctive search.
- ILogicalExpression searchModeOptionExpr = new ConstantExpression(
- new AsterixConstantValue(new AString(FullTextContainsDescriptor.SEARCH_MODE_OPTION)));
- ILogicalExpression searchModeValExpr = new ConstantExpression(
- new AsterixConstantValue(new AString(FullTextContainsDescriptor.CONJUNCTIVE_SEARCH_MODE_OPTION)));
-
- // Add this option as arguments to the ftcontains().
- newArgs.add(new MutableObject<ILogicalExpression>(searchModeOptionExpr));
- newArgs.add(new MutableObject<ILogicalExpression>(searchModeValExpr));
}
}
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java
index f3f5581..160e909 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/FuzzyJoinRule.java
@@ -26,7 +26,6 @@
import org.apache.asterix.aqlplus.parser.AQLPlusParser;
import org.apache.asterix.aqlplus.parser.ParseException;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.struct.Identifier;
import org.apache.asterix.metadata.declared.MetadataProvider;
@@ -318,12 +317,7 @@
deepCopyVisitor.updatePrimaryKeys(context);
deepCopyVisitor.reset();
- ILogicalPlan plan;
- try {
- plan = translator.translate(clauses);
- } catch (AsterixException e) {
- throw new AlgebricksException(e);
- }
+ ILogicalPlan plan = translator.translate(clauses);
context.setVarCounter(counter.get());
ILogicalOperator outputOp = plan.getRoots().get(0).getValue();
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
index 95dfceb..3b6a959 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/IntroduceSecondaryIndexInsertDeleteRule.java
@@ -27,7 +27,6 @@
import org.apache.asterix.algebra.operators.CommitOperator;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.lang.common.util.FunctionUtil;
import org.apache.asterix.metadata.declared.DataSource;
import org.apache.asterix.metadata.declared.DataSourceIndex;
@@ -227,34 +226,28 @@
* if the index is enforcing field types (For open indexes), We add a cast
* operator to ensure type safety
*/
- try {
- if (primaryIndexModificationOp.getOperation() == Kind.INSERT
- || primaryIndexModificationOp.getOperation() == Kind.UPSERT
- /* Actually, delete should not be here but it is now until issue
- * https://issues.apache.org/jira/browse/ASTERIXDB-1507
- * is solved
- */
- || primaryIndexModificationOp.getOperation() == Kind.DELETE) {
- injectFieldAccessesForIndexes(context, dataset, indexes, fieldVarsForNewRecord, recType, metaType,
- newRecordVar, newMetaVar, primaryIndexModificationOp, false);
- if (replicateOp != null) {
- context.computeAndSetTypeEnvironmentForOperator(replicateOp);
- }
+ if (primaryIndexModificationOp.getOperation() == Kind.INSERT
+ || primaryIndexModificationOp.getOperation() == Kind.UPSERT
+ /* Actually, delete should not be here but it is now until issue
+ * https://issues.apache.org/jira/browse/ASTERIXDB-1507
+ * is solved
+ */
+ || primaryIndexModificationOp.getOperation() == Kind.DELETE) {
+ injectFieldAccessesForIndexes(context, dataset, indexes, fieldVarsForNewRecord, recType, metaType,
+ newRecordVar, newMetaVar, primaryIndexModificationOp, false);
+ if (replicateOp != null) {
+ context.computeAndSetTypeEnvironmentForOperator(replicateOp);
}
- if (primaryIndexModificationOp.getOperation() == Kind.UPSERT
- /* Actually, delete should be here but it is not until issue
- * https://issues.apache.org/jira/browse/ASTERIXDB-1507
- * is solved
- */) {
- List<LogicalVariable> beforeOpMetaVars = primaryIndexModificationOp
- .getBeforeOpAdditionalNonFilteringVars();
- LogicalVariable beforeOpMetaVar = beforeOpMetaVars == null ? null : beforeOpMetaVars.get(0);
- currentTop = injectFieldAccessesForIndexes(context, dataset, indexes, fieldVarsForBeforeOperation,
- recType, metaType, primaryIndexModificationOp.getBeforeOpRecordVar(), beforeOpMetaVar,
- currentTop, true);
- }
- } catch (AsterixException e) {
- throw new AlgebricksException(e);
+ }
+ if (primaryIndexModificationOp.getOperation() == Kind.UPSERT
+ /* Actually, delete should be here but it is not until issue
+ * https://issues.apache.org/jira/browse/ASTERIXDB-1507
+ * is solved
+ */) {
+ List<LogicalVariable> beforeOpMetaVars = primaryIndexModificationOp.getBeforeOpAdditionalNonFilteringVars();
+ LogicalVariable beforeOpMetaVar = beforeOpMetaVars == null ? null : beforeOpMetaVars.get(0);
+ currentTop = injectFieldAccessesForIndexes(context, dataset, indexes, fieldVarsForBeforeOperation, recType,
+ metaType, primaryIndexModificationOp.getBeforeOpRecordVar(), beforeOpMetaVar, currentTop, true);
}
// Iterate each secondary index and applying Index Update operations.
@@ -674,7 +667,7 @@
continue;
}
ScalarFunctionCallExpression isUnknownFuncExpr = new ScalarFunctionCallExpression(
- FunctionUtil.getFunctionInfo(BuiltinFunctions.IS_UNKOWN),
+ FunctionUtil.getFunctionInfo(BuiltinFunctions.IS_UNKNOWN),
new MutableObject<ILogicalExpression>(new VariableReferenceExpression(secondaryKeyVar)));
ScalarFunctionCallExpression notFuncExpr = new ScalarFunctionCallExpression(
FunctionUtil.getFunctionInfo(BuiltinFunctions.NOT),
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetupCommitExtensionOpRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetupCommitExtensionOpRule.java
index 18e5f5e..61339bf 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetupCommitExtensionOpRule.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/SetupCommitExtensionOpRule.java
@@ -23,7 +23,7 @@
import org.apache.asterix.algebra.operators.CommitOperator;
import org.apache.asterix.algebra.operators.physical.CommitPOperator;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.declared.DatasetDataSource;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -99,14 +99,14 @@
primaryKeyLogicalVars.add(new LogicalVariable(varRefExpr.getVariableReference().getId()));
}
- //get JobId(TransactorId)
+ //get TxnId(TransactorId)
MetadataProvider mp = (MetadataProvider) context.getMetadataProvider();
- JobId jobId = mp.getJobId();
+ TxnId txnId = mp.getTxnId();
//create the logical and physical operator
CommitOperator commitOperator = new CommitOperator(primaryKeyLogicalVars, isSink);
CommitPOperator commitPOperator =
- new CommitPOperator(jobId, dataset, primaryKeyLogicalVars, isSink);
+ new CommitPOperator(txnId, dataset, primaryKeyLogicalVars, isSink);
commitOperator.setPhysicalOperator(commitPOperator);
//create ExtensionOperator and put the commitOperator in it.
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
index fcc2d8b..10630a5 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/AccessMethodUtils.java
@@ -27,7 +27,6 @@
import org.apache.asterix.algebra.operators.physical.ExternalDataLookupPOperator;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.external.indexing.IndexingConstants;
@@ -313,11 +312,7 @@
// Primary keys.
if (dataset.getDatasetType() == DatasetType.EXTERNAL) {
//add primary keys
- try {
- appendExternalRecPrimaryKeys(dataset, dest);
- } catch (AsterixException e) {
- throw new AlgebricksException(e);
- }
+ appendExternalRecPrimaryKeys(dataset, dest);
} else {
dest.addAll(KeyFieldTypeUtil.getPartitoningKeyTypes(dataset, recordType, metaRecordType));
}
@@ -675,7 +670,7 @@
target.add(itemType);
}
- private static void appendExternalRecPrimaryKeys(Dataset dataset, List<Object> target) throws AsterixException {
+ private static void appendExternalRecPrimaryKeys(Dataset dataset, List<Object> target) throws AlgebricksException {
int numPrimaryKeys =
IndexingConstants.getRIDSize(((ExternalDatasetDetails) dataset.getDatasetDetails()).getProperties());
for (int i = 0; i < numPrimaryKeys; i++) {
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroducePrimaryIndexForAggregationRule.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroducePrimaryIndexForAggregationRule.java
new file mode 100644
index 0000000..7633f4c
--- /dev/null
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/IntroducePrimaryIndexForAggregationRule.java
@@ -0,0 +1,319 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.optimizer.rules.am;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.asterix.common.config.DatasetConfig;
+import org.apache.asterix.metadata.declared.DatasetDataSource;
+import org.apache.asterix.metadata.declared.MetadataProvider;
+import org.apache.asterix.metadata.entities.Dataset;
+import org.apache.asterix.metadata.entities.Index;
+import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.asterix.om.utils.ConstantExpressionUtil;
+import org.apache.commons.lang3.mutable.Mutable;
+import org.apache.commons.lang3.mutable.MutableObject;
+import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalExpression;
+import org.apache.hyracks.algebricks.core.algebra.base.ILogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.base.IOptimizationContext;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalExpressionTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalOperatorTag;
+import org.apache.hyracks.algebricks.core.algebra.base.LogicalVariable;
+import org.apache.hyracks.algebricks.core.algebra.expressions.AbstractFunctionCallExpression;
+import org.apache.hyracks.algebricks.core.algebra.metadata.IMetadataProvider;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractUnnestMapOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AggregateOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.AssignOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.DataSourceScanOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestMapOperator;
+import org.apache.hyracks.algebricks.core.algebra.operators.logical.visitors.VariableUtilities;
+import org.apache.hyracks.algebricks.core.algebra.util.OperatorPropertiesUtil;
+import org.apache.hyracks.algebricks.core.rewriter.base.IAlgebraicRewriteRule;
+
+/**
+ * Pattern to match in the plan:
+ * ...
+ * ^
+ * |
+ * aggregate operator (local)
+ * ^
+ * |
+ * (assign operator)?
+ * ^
+ * |
+ * datasource scan operator OR unnest map operator using the dataset (when WHERE exists on PK)
+ * ^
+ * |
+ * ...
+ *
+ *
+ * The plan is transformed into:
+ * ...
+ * ^
+ * |
+ * aggregate operator (local)
+ * ^
+ * |
+ * (assign operator)?
+ * ^
+ * |
+ * unnest map operator over the primary index
+ * ^
+ * |
+ * ...
+ * This rule optimizes aggregation queries involving only PKs. It uses the primary index, if present.
+ * The primary index is a BTree index that only stores PKs. Therefore, if an aggregation query can be answered by
+ * only the PKs, this rule will be fired to use the primary index instead of doing a scan/range search over the dataset.
+ */
+public class IntroducePrimaryIndexForAggregationRule implements IAlgebraicRewriteRule {
+ private final List<Mutable<ILogicalOperator>> parents;
+
+ public IntroducePrimaryIndexForAggregationRule() {
+ parents = new ArrayList<>();
+ }
+
+ @Override
+ public boolean rewritePre(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ parents.add(opRef);
+ return false;
+ }
+
+ @Override
+ public boolean rewritePost(Mutable<ILogicalOperator> opRef, IOptimizationContext context)
+ throws AlgebricksException {
+ // remove yourself
+ parents.remove(parents.size() - 1);
+ // already fired this rule on this operator?
+ if (context.checkIfInDontApplySet(this, opRef.getValue())) {
+ return false;
+ }
+ /* only interested in local aggregate operator */
+ if (opRef.getValue().getOperatorTag() != LogicalOperatorTag.AGGREGATE) {
+ return false;
+ }
+ AggregateOperator localAggregateOperator = (AggregateOperator) opRef.getValue();
+ if (localAggregateOperator.isGlobal()) {
+ return false;
+ }
+ context.addToDontApplySet(this, opRef.getValue());
+ // find the data scan or unnest map
+ Pair<Mutable<ILogicalOperator>,Mutable<ILogicalOperator>> scanAndAssignOpRef =
+ findScanAndAssignOperator(localAggregateOperator,context.getMetadataProvider());
+ if (scanAndAssignOpRef == null) {
+ return false;
+ }
+ // find its primary index and replace datascan
+ boolean transformed =
+ replaceDatascan(localAggregateOperator,scanAndAssignOpRef, context);
+ if (transformed) {
+ OperatorPropertiesUtil.typeOpRec(opRef, context);
+ }
+ return transformed;
+ }
+
+ private Pair<Mutable<ILogicalOperator>,Mutable<ILogicalOperator>> findScanAndAssignOperator(
+ ILogicalOperator localAggregateOperator, IMetadataProvider metadataProvider) throws AlgebricksException {
+ Mutable<ILogicalOperator> scanOpRef = localAggregateOperator.getInputs().get(0);
+ Mutable<ILogicalOperator> assignOpRef = null;
+ // assign operator may or may not exist
+ if (scanOpRef.getValue().getOperatorTag() == LogicalOperatorTag.ASSIGN) {
+ AssignOperator assignOperator = (AssignOperator) scanOpRef.getValue();
+ assignOpRef = new MutableObject<>(assignOperator);
+ scanOpRef = scanOpRef.getValue().getInputs().get(0);
+ }
+ // next operator must be datascan or unnest map using the dataset
+ if (scanOpRef.getValue().getOperatorTag() != LogicalOperatorTag.DATASOURCESCAN &&
+ scanOpRef.getValue().getOperatorTag() != LogicalOperatorTag.UNNEST_MAP) {
+ return null;
+ }
+ if (scanOpRef.getValue().getOperatorTag() == LogicalOperatorTag.UNNEST_MAP) {
+ // for unnest_map, check the index used is the primary index
+ UnnestMapOperator unnestMapOperator = (UnnestMapOperator) scanOpRef.getValue();
+ ILogicalExpression logicalExpression = unnestMapOperator.getExpressionRef().getValue();
+ if (logicalExpression.getExpressionTag() != LogicalExpressionTag.FUNCTION_CALL) {
+ return null;
+ }
+ AbstractFunctionCallExpression functionCallExpression = (AbstractFunctionCallExpression)logicalExpression;
+ if (functionCallExpression.getFunctionIdentifier() != BuiltinFunctions.INDEX_SEARCH) {
+ return null;
+ }
+ String indexName = ConstantExpressionUtil.getStringArgument(functionCallExpression,0);
+ String dataverseName = ConstantExpressionUtil.getStringArgument(functionCallExpression,2);
+ String datasetName = ConstantExpressionUtil.getStringArgument(functionCallExpression,3);
+ Index index = ((MetadataProvider)metadataProvider).getIndex(dataverseName, datasetName, indexName);
+ if (!index.isPrimaryIndex()) {
+ return null;
+ }
+ }
+ return Pair.of(scanOpRef,assignOpRef);
+ }
+
+ private boolean replaceDatascan(AggregateOperator localAggregateOperator,
+ Pair<Mutable<ILogicalOperator>,Mutable<ILogicalOperator>> scanAndAssignOpRef, IOptimizationContext context)
+ throws AlgebricksException {
+ /* find the primary index */
+ Mutable<ILogicalOperator> scanOperatorRef = scanAndAssignOpRef.getLeft();
+ Mutable<ILogicalOperator> assignOperatorRef = scanAndAssignOpRef.getRight();
+ AbstractScanOperator scanOperator = (AbstractScanOperator) scanOperatorRef.getValue();
+ BTreeJobGenParams originalBTreeParameters = new BTreeJobGenParams();
+ Pair<Dataset,Index> datasetAndIndex = findDatasetAndSecondaryPrimaryIndex(scanOperator,originalBTreeParameters,
+ context);
+ if (datasetAndIndex == null) {
+ return false;
+ }
+ Dataset dataset = datasetAndIndex.getLeft();
+ Index primaryIndex = datasetAndIndex.getRight();
+ /////// replace the operator. prepare the parameters of the BTree of the new unnestmap operator ///////
+ if (dataset.getDatasetType() == DatasetConfig.DatasetType.INTERNAL) {
+ /////// check usage of variables produced by scan operator in parents ///////
+ Set<LogicalVariable> variablesProducedByScanOp = getVariablesProducedByScanOp(scanOperator,
+ dataset.getPrimaryKeys().size(), scanOperator.getVariables().size());
+ boolean variablesAreUsed = scanOperatorVariablesAreUsed(localAggregateOperator, assignOperatorRef,
+ variablesProducedByScanOp);
+ if (variablesAreUsed) {
+ return false;
+ }
+ /////// initialize the secondary primary BTree parameters ///////
+ boolean retainInput;
+ BTreeJobGenParams newBTreeParameters;
+ if (scanOperator.getOperatorTag() == LogicalOperatorTag.DATASOURCESCAN) {
+ retainInput = AccessMethodUtils.retainInputs(scanOperator.getVariables(), scanOperator, parents);
+ newBTreeParameters = new BTreeJobGenParams(primaryIndex.getIndexName(), DatasetConfig.IndexType.BTREE,
+ dataset.getDataverseName(), dataset.getDatasetName(), retainInput,
+ scanOperator.getInputs().get(0).getValue().getExecutionMode() ==
+ AbstractLogicalOperator.ExecutionMode.UNPARTITIONED);
+ List<LogicalVariable> empty = new ArrayList<>();
+ newBTreeParameters.setLowKeyInclusive(true);
+ newBTreeParameters.setHighKeyInclusive(true);
+ newBTreeParameters.setIsEqCondition(false);
+ newBTreeParameters.setLowKeyVarList(empty, 0, 0);
+ newBTreeParameters.setHighKeyVarList(empty, 0, 0);
+ } else {
+ retainInput = originalBTreeParameters.getRetainInput();
+ newBTreeParameters = new BTreeJobGenParams(primaryIndex.getIndexName(), DatasetConfig.IndexType.BTREE,
+ dataset.getDataverseName(), dataset.getDatasetName(), retainInput,
+ originalBTreeParameters.getRequiresBroadcast());
+ newBTreeParameters.setLowKeyInclusive(originalBTreeParameters.isLowKeyInclusive());
+ newBTreeParameters.setHighKeyInclusive(originalBTreeParameters.isHighKeyInclusive());
+ newBTreeParameters.setIsEqCondition(originalBTreeParameters.isEqCondition());
+ newBTreeParameters.setLowKeyVarList(originalBTreeParameters.getLowKeyVarList(), 0,
+ originalBTreeParameters.getLowKeyVarList().size());
+ newBTreeParameters.setHighKeyVarList(originalBTreeParameters.getHighKeyVarList(), 0,
+ originalBTreeParameters.getHighKeyVarList().size());
+ }
+ ARecordType recordType = (ARecordType) ((MetadataProvider)context.getMetadataProvider()).findType(dataset);
+ ARecordType metaRecordType =
+ (ARecordType) ((MetadataProvider)context.getMetadataProvider()).findMetaType(dataset);
+ // create the operator that will replace the dataset scan/search
+ AbstractUnnestMapOperator primaryIndexUnnestOperator =
+ (AbstractUnnestMapOperator) AccessMethodUtils.createSecondaryIndexUnnestMap(dataset, recordType,
+ metaRecordType, primaryIndex, scanOperator.getInputs().get(0).getValue(),
+ newBTreeParameters, context, true, retainInput, false);
+
+ // re-use the PK variables of the original scan operator
+ primaryIndexUnnestOperator.getVariables().clear();
+ for (int i = 0; i < dataset.getPrimaryKeys().size(); i++) {
+ primaryIndexUnnestOperator.getVariables().add(scanOperator.getVariables().get(i));
+ }
+ // now replace
+ scanOperatorRef.setValue(primaryIndexUnnestOperator);
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Returns null if there is no primary index defined on the dataset
+ * @param scanOperator Scan or unnest-map operator
+ * @param originalBTreeParameters The BTree parameters if the operator is unnest-map
+ * @param context Needed to get the metadata provider and ask for the index
+ * @return The dataset and its primary index
+ * @throws AlgebricksException when there is a problem getting the dataset or its indexes from the metadata
+ */
+ private Pair<Dataset,Index> findDatasetAndSecondaryPrimaryIndex(AbstractScanOperator scanOperator,
+ BTreeJobGenParams originalBTreeParameters, IOptimizationContext context) throws AlgebricksException {
+ // #1. get the dataset
+ Dataset dataset;
+ // case 1: dataset scan
+ if (scanOperator.getOperatorTag() == LogicalOperatorTag.DATASOURCESCAN) {
+ dataset = ((DatasetDataSource)((DataSourceScanOperator)scanOperator).getDataSource()).getDataset();
+ } else {
+ // case 2: dataset range search
+ AbstractFunctionCallExpression primaryIndexFunctionCall =
+ (AbstractFunctionCallExpression) ((UnnestMapOperator)scanOperator).getExpressionRef().getValue();
+ originalBTreeParameters.readFromFuncArgs(primaryIndexFunctionCall.getArguments());
+ if (originalBTreeParameters.isEqCondition()) {
+ return null;
+ }
+ dataset = ((MetadataProvider)context.getMetadataProvider()).findDataset(
+ originalBTreeParameters.getDataverseName(), originalBTreeParameters.getDatasetName());
+ }
+ // #2. get all indexes and look for the primary one
+ List<Index> indexes = ((MetadataProvider)context.getMetadataProvider()).getDatasetIndexes(
+ dataset.getDataverseName(), dataset.getDatasetName());
+ for (Index index : indexes) {
+ if (index.getKeyFieldNames().isEmpty()) {
+ return Pair.of(dataset,index);
+ }
+ }
+ return null;
+ }
+
+ private Set<LogicalVariable> getVariablesProducedByScanOp(AbstractScanOperator scanOperator, int startPosition,
+ int endPosition) {
+ Set<LogicalVariable> variableSet = new HashSet<>();
+ // starting after PK, collect the produced variables
+ for (int i = startPosition; i < endPosition; i++) {
+ variableSet.add(scanOperator.getVariables().get(i));
+ }
+ return variableSet;
+ }
+
+ private boolean scanOperatorVariablesAreUsed(AggregateOperator localAggregateOperator,
+ Mutable<ILogicalOperator> assignOperatorRef, Set<LogicalVariable> variablesProducedByScanOp)
+ throws AlgebricksException {
+ // collect variables used by parents operators
+ Set<LogicalVariable> variablesUsedByParents = new HashSet<>();
+ for (Mutable<ILogicalOperator> parent : parents) {
+ VariableUtilities.getUsedVariables(parent.getValue(), variablesUsedByParents);
+ }
+ // collect variables used by local aggregate operator
+ VariableUtilities.getUsedVariables(localAggregateOperator, variablesUsedByParents);
+ // collect variables used by assign operator, if exists
+ if (assignOperatorRef != null) {
+ VariableUtilities.getUsedVariables(assignOperatorRef.getValue(), variablesUsedByParents);
+ }
+ // checking...
+ for (LogicalVariable producedVariable : variablesProducedByScanOp) {
+ if (variablesUsedByParents.contains(producedVariable)) {
+ return true;
+ }
+ }
+ return false;
+ }
+}
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
index 8e09164..d1506f7 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/am/InvertedIndexAccessMethod.java
@@ -877,7 +877,7 @@
private static SearchModifierType getFullTextOption(AbstractFunctionCallExpression funcExpr) {
if (funcExpr.getArguments().size() < 3 || funcExpr.getArguments().size() % 2 != 0) {
// If no parameters or incorrect number of parameters are given, the default search type is returned.
- return SearchModifierType.DISJUNCTIVE;
+ return SearchModifierType.CONJUNCTIVE;
}
// From the third argument, it contains full-text search options.
for (int i = 2; i < funcExpr.getArguments().size(); i = i + 2) {
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
index db6f985..414d464 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/AbstractLangTranslator.java
@@ -38,6 +38,7 @@
import org.apache.asterix.metadata.dataset.hints.DatasetHints;
import org.apache.asterix.metadata.entities.Dataverse;
import org.apache.asterix.metadata.utils.MetadataConstants;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -50,7 +51,7 @@
private static final Logger LOGGER = Logger.getLogger(AbstractLangTranslator.class.getName());
public void validateOperation(ICcApplicationContext appCtx, Dataverse defaultDataverse, Statement stmt)
- throws AsterixException {
+ throws AlgebricksException {
final IClusterStateManager clusterStateManager = appCtx.getClusterStateManager();
final IGlobalRecoveryManager globalRecoveryManager = appCtx.getGlobalRecoveryManager();
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
index d5f41df..719824b 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/LangExpressionToPlanTranslator.java
@@ -245,7 +245,8 @@
AssignOperator assign = new AssignOperator(pkVars, pkExprs);
assign.getInputs().add(new MutableObject<>(dssOp));
- // If the input is pre-sorted, we set the ordering property explicitly in the assign
+ // If the input is pre-sorted, we set the ordering property explicitly in the
+ // assign
if (clffs.alreadySorted()) {
List<OrderColumn> orderColumns = new ArrayList<>();
for (int i = 0; i < pkVars.size(); ++i) {
@@ -328,13 +329,13 @@
}
} else {
/**
- * add the collection-to-sequence right before the project,
- * because dataset only accept non-collection records
+ * add the collection-to-sequence right before the project, because dataset only
+ * accept non-collection records
*/
LogicalVariable seqVar = context.newVar();
/**
- * This assign adds a marker function collection-to-sequence: if the input is a singleton collection, unnest
- * it; otherwise do nothing.
+ * This assign adds a marker function collection-to-sequence: if the input is a
+ * singleton collection, unnest it; otherwise do nothing.
*/
AssignOperator assignCollectionToSequence = new AssignOperator(seqVar,
new MutableObject<>(new ScalarFunctionCallExpression(
@@ -557,7 +558,8 @@
return processReturningExpression(rootOperator, insertOp, compiledInsert);
}
- // Stitches the translated operators for the returning expression into the query plan.
+ // Stitches the translated operators for the returning expression into the query
+ // plan.
private ILogicalOperator processReturningExpression(ILogicalOperator inputOperator,
InsertDeleteUpsertOperator insertOp, CompiledInsertStatement compiledInsert) throws AlgebricksException {
Expression returnExpression = compiledInsert.getReturnExpression();
@@ -566,7 +568,7 @@
}
ILogicalOperator rootOperator = inputOperator;
- //Makes the id of the insert var point to the record variable.
+ // Makes the id of the insert var point to the record variable.
context.newVarFromExpression(compiledInsert.getVar());
context.setVar(compiledInsert.getVar(),
((VariableReferenceExpression) insertOp.getPayloadExpression().getValue()).getVariableReference());
@@ -606,7 +608,7 @@
dataset.getDatasetDetails(), domain);
}
- private FileSplit getDefaultOutputFileLocation(ICcApplicationContext appCtx) throws MetadataException {
+ private FileSplit getDefaultOutputFileLocation(ICcApplicationContext appCtx) throws AlgebricksException {
String outputDir = System.getProperty("java.io.tmpDir");
String filePath =
outputDir + System.getProperty("file.separator") + OUTPUT_FILE_PREFIX + outputFileID.incrementAndGet();
@@ -702,8 +704,12 @@
}
AbstractFunctionCallExpression f;
- if ((f = lookupUserDefinedFunction(signature, args)) == null) {
- f = lookupBuiltinFunction(signature.getName(), signature.getArity(), args);
+ try {
+ if ((f = lookupUserDefinedFunction(signature, args)) == null) {
+ f = lookupBuiltinFunction(signature.getName(), signature.getArity(), args);
+ }
+ } catch (AlgebricksException e) {
+ throw new CompilationException(e);
}
if (f == null) {
@@ -726,7 +732,7 @@
}
private AbstractFunctionCallExpression lookupUserDefinedFunction(FunctionSignature signature,
- List<Mutable<ILogicalExpression>> args) throws MetadataException {
+ List<Mutable<ILogicalExpression>> args) throws AlgebricksException {
if (signature.getNamespace() == null) {
return null;
}
@@ -1360,7 +1366,7 @@
|| k == Kind.FIELD_ACCESSOR_EXPRESSION;
noNesting = noNesting || k == Kind.INDEX_ACCESSOR_EXPRESSION || k == Kind.UNARY_EXPRESSION
|| k == Kind.IF_EXPRESSION;
- return noNesting || k == Kind.INDEPENDENT_SUBQUERY || k == Kind.CASE_EXPRESSION;
+ return noNesting || k == Kind.CASE_EXPRESSION;
}
@@ -1406,8 +1412,8 @@
}
/**
- * Eliminate shared operator references in a query plan.
- * Deep copy a new query plan subtree whenever there is a shared operator reference.
+ * Eliminate shared operator references in a query plan. Deep copy a new query
+ * plan subtree whenever there is a shared operator reference.
*
* @param plan,
* the query plan.
@@ -1421,15 +1427,16 @@
}
/**
- * Eliminate shared operator references in a query plan rooted at <code>currentOpRef.getValue()</code>.
- * Deep copy a new query plan subtree whenever there is a shared operator reference.
+ * Eliminate shared operator references in a query plan rooted at
+ * <code>currentOpRef.getValue()</code>. Deep copy a new query plan subtree
+ * whenever there is a shared operator reference.
*
* @param currentOpRef,
* the operator reference to consider
* @param opRefSet,
* the set storing seen operator references so far.
- * @return a mapping that maps old variables to new variables, for the ancestors of
- * <code>currentOpRef</code> to replace variables properly.
+ * @return a mapping that maps old variables to new variables, for the ancestors
+ * of <code>currentOpRef</code> to replace variables properly.
* @throws CompilationException
*/
private LinkedHashMap<LogicalVariable, LogicalVariable> eliminateSharedOperatorReference(
@@ -1441,9 +1448,12 @@
// Recursively eliminates shared references in nested plans.
if (currentOperator.hasNestedPlans()) {
- // Since a nested plan tree itself can never be shared with another nested plan tree in
- // another operator, the operation called in the if block does not need to replace
- // any variables further for <code>currentOpRef.getValue()</code> nor its ancestor.
+ // Since a nested plan tree itself can never be shared with another nested plan
+ // tree in
+ // another operator, the operation called in the if block does not need to
+ // replace
+ // any variables further for <code>currentOpRef.getValue()</code> nor its
+ // ancestor.
AbstractOperatorWithNestedPlans opWithNestedPlan = (AbstractOperatorWithNestedPlans) currentOperator;
for (ILogicalPlan plan : opWithNestedPlan.getNestedPlans()) {
for (Mutable<ILogicalOperator> rootRef : plan.getRoots()) {
@@ -1465,7 +1475,8 @@
LinkedHashMap<LogicalVariable, LogicalVariable> cloneVarMap =
visitor.getInputToOutputVariableMapping();
- // Substitute variables according to the deep copy which generates new variables.
+ // Substitute variables according to the deep copy which generates new
+ // variables.
VariableUtilities.substituteVariables(currentOperator, cloneVarMap, null);
varMap.putAll(cloneVarMap);
@@ -1481,7 +1492,8 @@
// Substitute variables according to the new subtree.
VariableUtilities.substituteVariables(currentOperator, childVarMap, null);
- // Updates mapping like <$a, $b> in varMap to <$a, $c>, where there is a mapping <$b, $c>
+ // Updates mapping like <$a, $b> in varMap to <$a, $c>, where there is a mapping
+ // <$b, $c>
// in childVarMap.
varMap.entrySet().forEach(entry -> {
LogicalVariable newVar = childVarMap.get(entry.getValue());
@@ -1512,7 +1524,8 @@
* the expression to select tuples that are processed by this branch.
* @param branchExpression,
* the expression to be evaluated in this branch.
- * @return a pair of the constructed subplan operator and the output variable for the branch.
+ * @return a pair of the constructed subplan operator and the output variable
+ * for the branch.
* @throws CompilationException
*/
protected Pair<ILogicalOperator, LogicalVariable> constructSubplanOperatorForBranch(ILogicalOperator inputOp,
@@ -1523,7 +1536,8 @@
Mutable<ILogicalOperator> nestedSource =
new MutableObject<>(new NestedTupleSourceOperator(new MutableObject<>(subplanOp)));
SelectOperator select = new SelectOperator(selectExpr, false, null);
- // The select operator cannot be moved up and down, otherwise it will cause typing issues (ASTERIXDB-1203).
+ // The select operator cannot be moved up and down, otherwise it will cause
+ // typing issues (ASTERIXDB-1203).
OperatorPropertiesUtil.markMovable(select, false);
select.getInputs().add(nestedSource);
Pair<ILogicalOperator, LogicalVariable> pBranch = branchExpression.accept(this, new MutableObject<>(select));
@@ -1552,12 +1566,14 @@
return new AssignOperator(v1, new MutableObject<>(comparison));
}
- // Generates the filter condition for whether a conditional branch should be executed.
+ // Generates the filter condition for whether a conditional branch should be
+ // executed.
protected Mutable<ILogicalExpression> generateNoMatchedPrecedingWhenBranchesFilter(
List<ILogicalExpression> inputBooleanExprs) {
List<Mutable<ILogicalExpression>> arguments = new ArrayList<>();
for (ILogicalExpression inputBooleanExpr : inputBooleanExprs) {
- // A NULL/MISSING valued WHEN expression does not lead to the corresponding THEN execution.
+ // A NULL/MISSING valued WHEN expression does not lead to the corresponding THEN
+ // execution.
// Therefore, we should check a previous WHEN boolean condition is not unknown.
arguments.add(generateAndNotIsUnknownWrap(inputBooleanExpr));
}
@@ -1572,7 +1588,7 @@
List<Mutable<ILogicalExpression>> arguments = new ArrayList<>();
arguments.add(new MutableObject<>(logicalExpr));
Mutable<ILogicalExpression> expr = new MutableObject<>(
- new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.IS_UNKOWN),
+ new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.IS_UNKNOWN),
new ArrayList<>(Collections.singletonList(new MutableObject<>(logicalExpr)))));
arguments.add(new MutableObject<>(new ScalarFunctionCallExpression(
FunctionUtil.getFunctionInfo(BuiltinFunctions.NOT), new ArrayList<>(Collections.singletonList(expr)))));
@@ -1580,7 +1596,8 @@
new ScalarFunctionCallExpression(FunctionUtil.getFunctionInfo(BuiltinFunctions.AND), arguments));
}
- // Generates the plan for "UNION ALL" or union expression from its input expressions.
+ // Generates the plan for "UNION ALL" or union expression from its input
+ // expressions.
protected Pair<ILogicalOperator, LogicalVariable> translateUnionAllFromInputExprs(List<ILangExpression> inputExprs,
Mutable<ILogicalOperator> tupSource) throws CompilationException {
List<Mutable<ILogicalOperator>> inputOpRefsToUnion = new ArrayList<>();
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionOutput.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionOutput.java
index b559df8..f7031a4 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionOutput.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SessionOutput.java
@@ -20,6 +20,7 @@
package org.apache.asterix.translator;
import java.io.PrintWriter;
+import java.io.StringWriter;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.algebra.prettyprint.AlgebricksAppendable;
@@ -29,6 +30,8 @@
// Output path for primary execution.
private final PrintWriter out;
+ private StringWriter buffer;
+ private PrintWriter bufferedOut;
private final SessionOutput.ResultDecorator preResultDecorator;
private final SessionOutput.ResultDecorator postResultDecorator;
@@ -53,7 +56,31 @@
* Retrieve the PrintWriter to produce output to.
*/
public PrintWriter out() {
- return this.out;
+ return this.bufferedOut != null ? this.bufferedOut : this.out;
+ }
+
+ /**
+ * buffer the data provided to the PrintWriter returned by out() to be able to set the status of the response
+ * message when it can be determined. This is a no-op, if data is already buffered.
+ */
+ public void hold() {
+ if (this.bufferedOut == null) {
+ this.buffer = new StringWriter();
+ this.bufferedOut = new PrintWriter(this.buffer);
+ }
+ }
+
+ /**
+ * release the data that was buffered by calling hold() and remove the buffer from the pipeline.
+ * This is a no-op, if data is not buffered.
+ */
+ public void release() {
+ if (this.bufferedOut != null) {
+ this.bufferedOut.flush();
+ this.out.write(buffer.toString());
+ this.bufferedOut = null;
+ this.buffer = null;
+ }
}
public AlgebricksAppendable resultPrefix(AlgebricksAppendable app) throws AlgebricksException {
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java
index d37c7af..c17b55b 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/SqlppExpressionToPlanTranslator.java
@@ -54,7 +54,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.optype.JoinType;
import org.apache.asterix.lang.sqlpp.optype.SetOpType;
@@ -169,17 +168,6 @@
}
@Override
- public Pair<ILogicalOperator, LogicalVariable> visit(IndependentSubquery independentSubquery,
- Mutable<ILogicalOperator> tupleSource) throws CompilationException {
- Pair<ILogicalExpression, Mutable<ILogicalOperator>> eo =
- langExprToAlgExpression(independentSubquery.getExpr(), tupleSource);
- LogicalVariable var = context.newVar();
- AssignOperator assignOp = new AssignOperator(var, new MutableObject<ILogicalExpression>(eo.first));
- assignOp.getInputs().add(eo.second);
- return new Pair<>(assignOp, var);
- }
-
- @Override
public Pair<ILogicalOperator, LogicalVariable> visit(SelectSetOperation selectSetOperation,
Mutable<ILogicalOperator> tupSource) throws CompilationException {
SetOperationInput leftInput = selectSetOperation.getLeftInput();
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
index e50c7ca..9edfddb 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/TypeTranslator.java
@@ -27,13 +27,12 @@
import org.apache.asterix.common.annotations.IRecordFieldDataGen;
import org.apache.asterix.common.annotations.RecordDataGenAnnotation;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.lang.common.expression.OrderedListTypeDefinition;
import org.apache.asterix.lang.common.expression.RecordTypeDefinition;
+import org.apache.asterix.lang.common.expression.RecordTypeDefinition.RecordKind;
import org.apache.asterix.lang.common.expression.TypeExpression;
import org.apache.asterix.lang.common.expression.TypeReferenceExpression;
import org.apache.asterix.lang.common.expression.UnorderedListTypeDefinition;
-import org.apache.asterix.lang.common.expression.RecordTypeDefinition.RecordKind;
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.metadata.MetadataTransactionContext;
import org.apache.asterix.metadata.entities.BuiltinTypeMap;
@@ -61,8 +60,7 @@
}
public static Map<TypeSignature, IAType> computeTypes(MetadataTransactionContext mdTxnCtx, TypeExpression typeExpr,
- String typeName, String typeDataverse, Map<TypeSignature, IAType> typeMap)
- throws AlgebricksException {
+ String typeName, String typeDataverse, Map<TypeSignature, IAType> typeMap) throws AlgebricksException {
Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes = new HashMap<>();
Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes = new HashMap<>();
Map<TypeSignature, List<TypeSignature>> incompleteTopLevelTypeReferences = new HashMap<>();
@@ -89,48 +87,43 @@
throw new AlgebricksException("Cannot redefine builtin type " + typeName + " .");
}
TypeSignature typeSignature = new TypeSignature(typeDataverse, typeName);
- try {
- switch (typeExpr.getTypeKind()) {
- case TYPEREFERENCE: {
- TypeReferenceExpression tre = (TypeReferenceExpression) typeExpr;
- IAType t = solveTypeReference(new TypeSignature(
- tre.getIdent().first == null ? typeDataverse : tre.getIdent().first.getValue(),
- tre.getIdent().second.getValue()), typeMap);
- if (t != null) {
- typeMap.put(typeSignature, t);
- } else {
- addIncompleteTopLevelTypeReference(tre, incompleteTopLevelTypeReferences,
- typeDataverse);
- }
- break;
+ switch (typeExpr.getTypeKind()) {
+ case TYPEREFERENCE: {
+ TypeReferenceExpression tre = (TypeReferenceExpression) typeExpr;
+ IAType t = solveTypeReference(new TypeSignature(
+ tre.getIdent().first == null ? typeDataverse : tre.getIdent().first.getValue(),
+ tre.getIdent().second.getValue()), typeMap);
+ if (t != null) {
+ typeMap.put(typeSignature, t);
+ } else {
+ addIncompleteTopLevelTypeReference(tre, incompleteTopLevelTypeReferences, typeDataverse);
}
- case RECORD: {
- RecordTypeDefinition rtd = (RecordTypeDefinition) typeExpr;
- ARecordType recType = computeRecordType(typeSignature, rtd, typeMap, incompleteFieldTypes,
- incompleteItemTypes, typeDataverse);
- typeMap.put(typeSignature, recType);
- break;
- }
- case ORDEREDLIST: {
- OrderedListTypeDefinition oltd = (OrderedListTypeDefinition) typeExpr;
- AOrderedListType olType = computeOrderedListType(typeSignature, oltd, typeMap, incompleteItemTypes,
- incompleteFieldTypes, typeDataverse);
- typeMap.put(typeSignature, olType);
- break;
- }
- case UNORDEREDLIST: {
- UnorderedListTypeDefinition ultd = (UnorderedListTypeDefinition) typeExpr;
- AUnorderedListType ulType = computeUnorderedListType(typeSignature, ultd, typeMap,
- incompleteItemTypes, incompleteFieldTypes, typeDataverse);
- typeMap.put(typeSignature, ulType);
- break;
- }
- default: {
- throw new IllegalStateException();
- }
+ break;
}
- } catch (AsterixException e) {
- throw new AlgebricksException(e);
+ case RECORD: {
+ RecordTypeDefinition rtd = (RecordTypeDefinition) typeExpr;
+ ARecordType recType = computeRecordType(typeSignature, rtd, typeMap, incompleteFieldTypes,
+ incompleteItemTypes, typeDataverse);
+ typeMap.put(typeSignature, recType);
+ break;
+ }
+ case ORDEREDLIST: {
+ OrderedListTypeDefinition oltd = (OrderedListTypeDefinition) typeExpr;
+ AOrderedListType olType = computeOrderedListType(typeSignature, oltd, typeMap, incompleteItemTypes,
+ incompleteFieldTypes, typeDataverse);
+ typeMap.put(typeSignature, olType);
+ break;
+ }
+ case UNORDEREDLIST: {
+ UnorderedListTypeDefinition ultd = (UnorderedListTypeDefinition) typeExpr;
+ AUnorderedListType ulType = computeUnorderedListType(typeSignature, ultd, typeMap, incompleteItemTypes,
+ incompleteFieldTypes, typeDataverse);
+ typeMap.put(typeSignature, ulType);
+ break;
+ }
+ default: {
+ throw new IllegalStateException();
+ }
}
}
@@ -204,7 +197,7 @@
private static AOrderedListType computeOrderedListType(TypeSignature typeSignature, OrderedListTypeDefinition oltd,
Map<TypeSignature, IAType> typeMap, Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes,
Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes, String defaultDataverse)
- throws AsterixException {
+ throws AlgebricksException {
TypeExpression tExpr = oltd.getItemTypeExpression();
String typeName = typeSignature != null ? typeSignature.getName() : null;
AOrderedListType aolt = new AOrderedListType(null, typeName);
@@ -216,7 +209,7 @@
UnorderedListTypeDefinition ultd, Map<TypeSignature, IAType> typeMap,
Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes,
Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes, String defaulDataverse)
- throws AsterixException {
+ throws AlgebricksException {
TypeExpression tExpr = ultd.getItemTypeExpression();
String typeName = typeSignature != null ? typeSignature.getName() : null;
AUnorderedListType ault = new AUnorderedListType(null, typeName);
@@ -227,7 +220,7 @@
private static void setCollectionItemType(TypeExpression tExpr, Map<TypeSignature, IAType> typeMap,
Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes,
Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes, AbstractCollectionType act,
- String defaultDataverse) throws AsterixException {
+ String defaultDataverse) throws AlgebricksException {
switch (tExpr.getTypeKind()) {
case ORDEREDLIST: {
OrderedListTypeDefinition oltd = (OrderedListTypeDefinition) tExpr;
@@ -327,7 +320,7 @@
private static ARecordType computeRecordType(TypeSignature typeSignature, RecordTypeDefinition rtd,
Map<TypeSignature, IAType> typeMap, Map<String, Map<ARecordType, List<Integer>>> incompleteFieldTypes,
Map<TypeSignature, List<AbstractCollectionType>> incompleteItemTypes, String defaultDataverse)
- throws AsterixException {
+ throws AlgebricksException {
List<String> names = rtd.getFieldNames();
int n = names.size();
String[] fldNames = new String[n];
@@ -337,8 +330,8 @@
fldNames[i++] = s;
}
boolean isOpen = rtd.getRecordKind() == RecordKind.OPEN;
- ARecordType recType = new ARecordType(typeSignature == null ? null : typeSignature.getName(), fldNames,
- fldTypes, isOpen);
+ ARecordType recType =
+ new ARecordType(typeSignature == null ? null : typeSignature.getName(), fldNames, fldTypes, isOpen);
List<IRecordFieldDataGen> fieldDataGen = rtd.getFieldDataGen();
if (fieldDataGen.size() == n) {
IRecordFieldDataGen[] rfdg = new IRecordFieldDataGen[n];
diff --git a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/ValidateUtil.java b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/ValidateUtil.java
index d262bb8..cda9dd3 100644
--- a/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/ValidateUtil.java
+++ b/asterixdb/asterix-algebra/src/main/java/org/apache/asterix/translator/util/ValidateUtil.java
@@ -118,6 +118,10 @@
}
List<String> fieldName = partitioningExprs.get(0);
IAType fieldType = recType.getSubFieldType(fieldName);
+ if (fieldType == null) {
+ String unTypeField = fieldName.get(0) == null ? "" : fieldName.get(0);
+ throw new CompilationException(ErrorCode.COMPILATION_FIELD_NOT_FOUND, unTypeField);
+ }
partitioningExprTypes.add(fieldType);
ATypeTag pkTypeTag = fieldType.getTypeTag();
if (pkTypeTag != ATypeTag.UUID) {
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index b039071..c162e14 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -577,5 +577,10 @@
<type>test-jar</type>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>hyracks-comm</artifactId>
+ <version>${hyracks.version}</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
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 2078288..1257a61 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
@@ -38,6 +38,7 @@
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.Job;
import org.apache.asterix.common.utils.Job.SubmissionMode;
import org.apache.asterix.compiler.provider.ILangCompilationProvider;
@@ -63,7 +64,7 @@
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.optimizer.base.FuzzyUtils;
import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
-import org.apache.asterix.transaction.management.service.transaction.JobIdFactory;
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
import org.apache.asterix.translator.CompiledStatements.ICompiledDmlStatement;
import org.apache.asterix.translator.IStatementExecutor.Stats;
import org.apache.asterix.translator.SessionConfig;
@@ -211,8 +212,8 @@
printPlanPostfix(output);
}
- org.apache.asterix.common.transactions.JobId asterixJobId = JobIdFactory.generateJobId();
- metadataProvider.setJobId(asterixJobId);
+ TxnId txnId = TxnIdFactory.create();
+ metadataProvider.setTxnId(txnId);
ILangExpressionToPlanTranslator t =
translatorFactory.createExpressionToPlanTranslator(metadataProvider, varCounter);
@@ -229,14 +230,7 @@
printPlanPrefix(output, "Logical plan");
if (rwQ != null || (statement != null && statement.getKind() == Statement.Kind.LOAD)) {
- AbstractLogicalOperatorPrettyPrintVisitor pvisitor;
- if (output.config().getLpfmt().equals(SessionConfig.PlanFormat.JSON)) {
- pvisitor = new LogicalOperatorPrettyPrintVisitorJson(output.out());
- } else {
- pvisitor = new LogicalOperatorPrettyPrintVisitor(output.out());
-
- }
- PlanPrettyPrinter.printPlan(plan, pvisitor, 0);
+ PlanPrettyPrinter.printPlan(plan, getPrettyPrintVisitor(output.config().getLpfmt(), output.out()), 0);
}
printPlanPostfix(output);
}
@@ -289,14 +283,8 @@
} else {
printPlanPrefix(output, "Optimized logical plan");
if (rwQ != null || (statement != null && statement.getKind() == Statement.Kind.LOAD)) {
- AbstractLogicalOperatorPrettyPrintVisitor pvisitor;
- if (output.config().getLpfmt().equals(SessionConfig.PlanFormat.JSON)) {
- pvisitor = new LogicalOperatorPrettyPrintVisitorJson(output.out());
-
- } else {
- pvisitor = new LogicalOperatorPrettyPrintVisitor(output.out());
- }
- PlanPrettyPrinter.printPlan(plan, pvisitor, 0);
+ PlanPrettyPrinter.printPlan(plan,
+ getPrettyPrintVisitor(output.config().getLpfmt(), output.out()), 0);
}
printPlanPostfix(output);
}
@@ -351,7 +339,7 @@
builder.setNormalizedKeyComputerFactoryProvider(format.getNormalizedKeyComputerFactoryProvider());
JobEventListenerFactory jobEventListenerFactory =
- new JobEventListenerFactory(asterixJobId, metadataProvider.isWriteTransaction());
+ new JobEventListenerFactory(txnId, metadataProvider.isWriteTransaction());
JobSpecification spec = compiler.createJob(metadataProvider.getApplicationContext(), jobEventListenerFactory);
// When the top-level statement is a query, the statement parameter is null.
@@ -378,6 +366,12 @@
return spec;
}
+ private AbstractLogicalOperatorPrettyPrintVisitor getPrettyPrintVisitor(SessionConfig.PlanFormat planFormat,
+ PrintWriter out) {
+ return planFormat.equals(SessionConfig.PlanFormat.JSON) ? new LogicalOperatorPrettyPrintVisitorJson(out)
+ : new LogicalOperatorPrettyPrintVisitor(out);
+ }
+
public void executeJobArray(IHyracksClientConnection hcc, JobSpecification[] specs, PrintWriter out)
throws Exception {
for (JobSpecification spec : specs) {
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
index 50c3ff6..2a8a831 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/common/AsterixHyracksIntegrationUtil.java
@@ -29,11 +29,14 @@
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.apache.asterix.app.external.ExternalUDFLibrarian;
import org.apache.asterix.common.api.IClusterManagementWork.ClusterState;
+import org.apache.asterix.common.api.INcApplicationContext;
import org.apache.asterix.common.config.GlobalConfig;
import org.apache.asterix.common.config.PropertiesAccessor;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.asterix.common.exceptions.AsterixException;
+import org.apache.asterix.common.library.ILibraryManager;
import org.apache.asterix.hyracks.bootstrap.CCApplication;
import org.apache.asterix.hyracks.bootstrap.NCApplication;
import org.apache.commons.io.FileUtils;
@@ -91,7 +94,7 @@
ncApplication.registerConfig(ncConfigManager);
nodeControllers.add(
new NodeControllerService(fixupIODevices(createNCConfig(nodeId, ncConfigManager)), ncApplication));
- } ;
+ }
cc.start();
@@ -122,6 +125,22 @@
this.ncs = nodeControllers.toArray(new NodeControllerService[nodeControllers.size()]);
}
+ public void init(boolean deleteOldInstanceData, String externalLibPath) throws Exception {
+ List<ILibraryManager> libraryManagers = new ArrayList<>();
+ ExternalUDFLibrarian librarian = new ExternalUDFLibrarian(libraryManagers);
+ librarian.cleanup();
+ init(deleteOldInstanceData);
+ if (externalLibPath != null && externalLibPath.length() != 0) {
+ libraryManagers.add(((ICcApplicationContext) cc.getApplicationContext()).getLibraryManager());
+ for (NodeControllerService nc : ncs) {
+ INcApplicationContext runtimeCtx = (INcApplicationContext) nc.getApplicationContext();
+ libraryManagers.add(runtimeCtx.getLibraryManager());
+ }
+ librarian.install(System.getProperty("external.lib.dataverse", "test"),
+ System.getProperty("external.lib.libname", "testlib"), externalLibPath);
+ }
+ }
+
public ClusterControllerService getClusterControllerService() {
return cc;
}
@@ -271,14 +290,15 @@
public static void main(String[] args) throws Exception {
AsterixHyracksIntegrationUtil integrationUtil = new AsterixHyracksIntegrationUtil();
try {
- integrationUtil.run(Boolean.getBoolean("cleanup.start"), Boolean.getBoolean("cleanup.shutdown"));
+ integrationUtil.run(Boolean.getBoolean("cleanup.start"), Boolean.getBoolean("cleanup.shutdown"),
+ System.getProperty("external.lib", ""));
} catch (Exception e) {
LOGGER.log(Level.WARNING, "Unexpected exception", e);
System.exit(1);
}
}
- protected void run(boolean cleanupOnStart, boolean cleanupOnShutdown) throws Exception {
+ protected void run(boolean cleanupOnStart, boolean cleanupOnShutdown, String loadExternalLibs) throws Exception {
Runtime.getRuntime().addShutdownHook(new Thread() {
@Override
public void run() {
@@ -291,7 +311,7 @@
});
System.setProperty(GlobalConfig.CONFIG_FILE_PROPERTY, "asterix-build-configuration.xml");
- init(cleanupOnStart);
+ init(cleanupOnStart, loadExternalLibs);
while (true) {
Thread.sleep(10000);
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java
index b51187c..ba7ee12 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ConnectorApiServlet.java
@@ -102,7 +102,6 @@
out.flush();
return;
}
- boolean temp = dataset.getDatasetDetails().isTemp();
FileSplit[] fileSplits = metadataProvider.splitsForIndex(mdTxnCtx, dataset, datasetName);
ARecordType recordType = (ARecordType) metadataProvider.findType(dataset.getItemTypeDataverseName(),
dataset.getItemTypeName());
@@ -115,7 +114,7 @@
}
pkStrBuf.delete(pkStrBuf.length() - 1, pkStrBuf.length());
// Constructs the returned json object.
- formResponseObject(jsonResponse, fileSplits, recordType, pkStrBuf.toString(), temp,
+ formResponseObject(jsonResponse, fileSplits, recordType, pkStrBuf.toString(),
hcc.getNodeControllerInfos());
// Flush the cached contents of the dataset to file system.
@@ -138,10 +137,8 @@
}
private void formResponseObject(ObjectNode jsonResponse, FileSplit[] fileSplits, ARecordType recordType,
- String primaryKeys, boolean temp, Map<String, NodeControllerInfo> nodeMap) {
+ String primaryKeys, Map<String, NodeControllerInfo> nodeMap) {
ArrayNode partititons = OBJECT_MAPPER.createArrayNode();
- // Whether the dataset is temp or not
- jsonResponse.put("temp", temp);
// Adds a primary key.
jsonResponse.put("keys", primaryKeys);
// Adds record type.
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
index 616c22e..64ea73d 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/NCQueryServiceServlet.java
@@ -116,6 +116,8 @@
throw new Exception(err.toString(), err);
}
}
+ // no errors - stop buffering and allow for streaming result delivery
+ sessionOutput.release();
IStatementExecutor.ResultMetadata resultMetadata = responseMsg.getMetadata();
if (delivery == IStatementExecutor.ResultDelivery.IMMEDIATE && !resultMetadata.getResultSets().isEmpty()) {
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 f8f5c18..42c9edd 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
@@ -381,25 +381,25 @@
RequestParameters param = getRequestParameters(request);
LOGGER.info(param.toString());
long elapsedStart = System.nanoTime();
- final StringWriter stringWriter = new StringWriter();
- final PrintWriter resultWriter = new PrintWriter(stringWriter);
+ final PrintWriter httpWriter = response.writer();
ResultDelivery delivery = parseResultDelivery(param.mode);
String handleUrl = getHandleUrl(param.host, param.path, delivery);
- SessionOutput sessionOutput = createSessionOutput(param, handleUrl, resultWriter);
+ SessionOutput sessionOutput = createSessionOutput(param, handleUrl, httpWriter);
SessionConfig sessionConfig = sessionOutput.config();
HttpUtil.setContentType(response, HttpUtil.ContentType.APPLICATION_JSON, HttpUtil.Encoding.UTF8);
- HttpResponseStatus status = HttpResponseStatus.OK;
Stats stats = new Stats();
long[] execStartEnd = new long[] { -1, -1 };
- resultWriter.print("{\n");
- printRequestId(resultWriter);
- printClientContextID(resultWriter, param);
- printSignature(resultWriter);
- printType(resultWriter, sessionConfig);
+ // buffer the output until we are ready to set the status of the response message correctly
+ sessionOutput.hold();
+ sessionOutput.out().print("{\n");
+ printRequestId(sessionOutput.out());
+ printClientContextID(sessionOutput.out(), param);
+ printSignature(sessionOutput.out());
+ printType(sessionOutput.out(), sessionConfig);
long errorCount = 1; // so far we just return 1 error
try {
if (param.statement == null || param.statement.isEmpty()) {
@@ -410,33 +410,30 @@
if (optionalParamProvider != null) {
optionalParams = optionalParamProvider.apply(request);
}
+ response.setStatus(HttpResponseStatus.OK);
executeStatement(statementsText, sessionOutput, delivery, stats, param, execStartEnd, optionalParams);
if (ResultDelivery.IMMEDIATE == delivery || ResultDelivery.DEFERRED == delivery) {
ResultUtil.printStatus(sessionOutput, ResultStatus.SUCCESS);
}
errorCount = 0;
} catch (Exception | TokenMgrError | org.apache.asterix.aqlplus.parser.TokenMgrError e) {
- status = handleExecuteStatementException(e);
- ResultUtil.printError(resultWriter, e);
+ response.setStatus(handleExecuteStatementException(e));
+ ResultUtil.printError(sessionOutput.out(), e);
ResultUtil.printStatus(sessionOutput, ResultStatus.FATAL);
} finally {
+ // make sure that we stop buffering and return the result to the http response
+ sessionOutput.release();
if (execStartEnd[0] == -1) {
execStartEnd[1] = -1;
} else if (execStartEnd[1] == -1) {
execStartEnd[1] = System.nanoTime();
}
}
- printMetrics(resultWriter, System.nanoTime() - elapsedStart, execStartEnd[1] - execStartEnd[0],
+ printMetrics(sessionOutput.out(), System.nanoTime() - elapsedStart, execStartEnd[1] - execStartEnd[0],
stats.getCount(), stats.getSize(), stats.getProcessedObjects(), errorCount);
- resultWriter.print("}\n");
- resultWriter.flush();
- String result = stringWriter.toString();
-
- GlobalConfig.ASTERIX_LOGGER.log(Level.FINE, result);
-
- response.setStatus(status);
- response.writer().print(result);
- if (response.writer().checkError()) {
+ sessionOutput.out().print("}\n");
+ sessionOutput.out().flush();
+ if (sessionOutput.out().checkError()) {
LOGGER.warning("Error flushing output writer");
}
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
index d13a15d..ec0680f 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/active/ActiveNotificationHandler.java
@@ -33,7 +33,6 @@
import org.apache.asterix.active.IActiveNotificationHandler;
import org.apache.asterix.active.message.ActivePartitionMessage;
import org.apache.asterix.common.api.IMetadataLockManager;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.common.exceptions.RuntimeDataException;
import org.apache.asterix.metadata.api.IActiveEntityController;
@@ -41,6 +40,7 @@
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.utils.DatasetUtil;
import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.job.IJobLifecycleListener;
@@ -226,7 +226,7 @@
}
public void suspend(MetadataProvider mdProvider)
- throws AsterixException, HyracksDataException, InterruptedException {
+ throws AlgebricksException, HyracksDataException, InterruptedException {
synchronized (this) {
if (suspended) {
throw new RuntimeDataException(ErrorCode.ACTIVE_EVENT_HANDLER_ALREADY_SUSPENDED);
@@ -256,7 +256,7 @@
}
public void resume(MetadataProvider mdProvider)
- throws AsterixException, HyracksDataException, InterruptedException {
+ throws HyracksDataException, InterruptedException {
LOGGER.log(level, "Resuming active events handler");
for (IActiveEntityEventsListener listener : entityEventListeners.values()) {
LOGGER.log(level, "Resuming " + listener.getEntityId());
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
index 5f86c28..4271d55 100755
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalLibraryUtils.java
@@ -346,7 +346,7 @@
if (jarsInLibDir.length > 1) {
throw new Exception("Incorrect library structure: found multiple library jars");
}
- if (jarsInLibDir.length < 0) {
+ if (jarsInLibDir.length <= 0) {
throw new Exception("Incorrect library structure: could not find library jar");
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java
similarity index 95%
rename from asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java
rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java
index 76fa308..b1d2159 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/external/TestLibrarian.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/ExternalUDFLibrarian.java
@@ -28,17 +28,16 @@
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.library.ILibraryManager;
import org.apache.asterix.event.service.AsterixEventServiceUtil;
-import org.apache.asterix.test.common.ITestLibrarian;
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.algebricks.common.utils.Pair;
-public class TestLibrarian implements ITestLibrarian {
+public class ExternalUDFLibrarian implements IExternalUDFLibrarian {
// The following list includes a library manager for the CC
// and library managers for NCs (one-per-NC).
private final List<ILibraryManager> libraryManagers;
- public TestLibrarian(List<ILibraryManager> libraryManagers) {
+ public ExternalUDFLibrarian(List<ILibraryManager> libraryManagers) {
this.libraryManagers = libraryManagers;
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/IExternalUDFLibrarian.java
similarity index 93%
rename from asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java
rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/IExternalUDFLibrarian.java
index d661710..9a17444 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ITestLibrarian.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/external/IExternalUDFLibrarian.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.asterix.test.common;
+package org.apache.asterix.app.external;
import java.io.IOException;
import java.rmi.RemoteException;
@@ -24,7 +24,7 @@
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.exceptions.AsterixException;
-public interface ITestLibrarian {
+public interface IExternalUDFLibrarian {
public void install(String dvName, String libName, String libPath) throws IOException, Exception;
public void uninstall(String dvName, String libName) throws RemoteException, AsterixException, ACIDException;
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
index 7b08f68..e77d535 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/NCAppRuntimeContext.java
@@ -481,7 +481,9 @@
@Override
public synchronized void unexportMetadataNodeStub() throws RemoteException {
- UnicastRemoteObject.unexportObject(MetadataNode.INSTANCE, false);
+ if (metadataNodeStub != null) {
+ UnicastRemoteObject.unexportObject(MetadataNode.INSTANCE, false);
+ }
metadataNodeStub = null;
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java
index a502de9..19966fe 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/RecoveryManager.java
@@ -61,14 +61,14 @@
import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepository;
import org.apache.asterix.transaction.management.service.logging.LogManager;
import org.apache.asterix.transaction.management.service.recovery.AbstractCheckpointManager;
-import org.apache.asterix.transaction.management.service.recovery.TxnId;
+import org.apache.asterix.transaction.management.service.recovery.TxnEntityId;
import org.apache.asterix.transaction.management.service.transaction.TransactionManagementConstants;
import org.apache.commons.io.FileUtils;
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.lifecycle.ILifeCycleComponent;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
@@ -87,7 +87,7 @@
private final LogManager logMgr;
private final boolean replicationEnabled;
private static final String RECOVERY_FILES_DIR_NAME = "recovery_temp";
- private Map<Integer, JobEntityCommits> jobId2WinnerEntitiesMap = null;
+ private Map<Long, JobEntityCommits> jobId2WinnerEntitiesMap = null;
private final long cachedEntityCommitsPerJobSize;
private final PersistentLocalResourceRepository localResourceRepository;
private final ICheckpointManager checkpointManager;
@@ -183,7 +183,7 @@
public synchronized void replayPartitionsLogs(Set<Integer> partitions, ILogReader logReader, long lowWaterMarkLSN)
throws IOException, ACIDException {
try {
- Set<Integer> winnerJobSet = startRecoverysAnalysisPhase(partitions, logReader, lowWaterMarkLSN);
+ Set<Long> winnerJobSet = startRecoverysAnalysisPhase(partitions, logReader, lowWaterMarkLSN);
startRecoveryRedoPhase(partitions, logReader, lowWaterMarkLSN, winnerJobSet);
} finally {
logReader.close();
@@ -191,17 +191,17 @@
}
}
- private synchronized Set<Integer> startRecoverysAnalysisPhase(Set<Integer> partitions, ILogReader logReader,
+ private synchronized Set<Long> startRecoverysAnalysisPhase(Set<Integer> partitions, ILogReader logReader,
long lowWaterMarkLSN) throws IOException, ACIDException {
int updateLogCount = 0;
int entityCommitLogCount = 0;
int jobCommitLogCount = 0;
int abortLogCount = 0;
- Set<Integer> winnerJobSet = new HashSet<>();
+ Set<Long> winnerJobSet = new HashSet<>();
jobId2WinnerEntitiesMap = new HashMap<>();
//set log reader to the lowWaterMarkLsn
ILogRecord logRecord;
- logReader.initializeScan(lowWaterMarkLSN);
+ logReader.setPosition(lowWaterMarkLSN);
logRecord = logReader.next();
while (logRecord != null) {
if (IS_DEBUG_MODE) {
@@ -214,8 +214,8 @@
}
break;
case LogType.JOB_COMMIT:
- winnerJobSet.add(logRecord.getJobId());
- cleanupJobCommits(logRecord.getJobId());
+ winnerJobSet.add(logRecord.getTxnId());
+ cleanupTxnCommits(logRecord.getTxnId());
jobCommitLogCount++;
break;
case LogType.ENTITY_COMMIT:
@@ -249,38 +249,38 @@
return winnerJobSet;
}
- private void cleanupJobCommits(int jobId) {
- if (jobId2WinnerEntitiesMap.containsKey(jobId)) {
- JobEntityCommits jobEntityWinners = jobId2WinnerEntitiesMap.get(jobId);
+ private void cleanupTxnCommits(long txnId) {
+ if (jobId2WinnerEntitiesMap.containsKey(txnId)) {
+ JobEntityCommits jobEntityWinners = jobId2WinnerEntitiesMap.get(txnId);
//to delete any spilled files as well
jobEntityWinners.clear();
- jobId2WinnerEntitiesMap.remove(jobId);
+ jobId2WinnerEntitiesMap.remove(txnId);
}
}
private void analyzeEntityCommitLog(ILogRecord logRecord) throws IOException {
- int jobId = logRecord.getJobId();
+ long txnId = logRecord.getTxnId();
JobEntityCommits jobEntityWinners;
- if (!jobId2WinnerEntitiesMap.containsKey(jobId)) {
- jobEntityWinners = new JobEntityCommits(jobId);
+ if (!jobId2WinnerEntitiesMap.containsKey(txnId)) {
+ jobEntityWinners = new JobEntityCommits(txnId);
if (needToFreeMemory()) {
// If we don't have enough memory for one more job,
// we will force all jobs to spill their cached entities to disk.
// This could happen only when we have many jobs with small
// number of records and none of them have job commit.
- freeJobsCachedEntities(jobId);
+ freeJobsCachedEntities(txnId);
}
- jobId2WinnerEntitiesMap.put(jobId, jobEntityWinners);
+ jobId2WinnerEntitiesMap.put(txnId, jobEntityWinners);
} else {
- jobEntityWinners = jobId2WinnerEntitiesMap.get(jobId);
+ jobEntityWinners = jobId2WinnerEntitiesMap.get(txnId);
}
jobEntityWinners.add(logRecord);
}
private synchronized void startRecoveryRedoPhase(Set<Integer> partitions, ILogReader logReader,
- long lowWaterMarkLSN, Set<Integer> winnerJobSet) throws IOException, ACIDException {
+ long lowWaterMarkLSN, Set<Long> winnerTxnSet) throws IOException, ACIDException {
int redoCount = 0;
- int jobId = -1;
+ long txnId = 0;
long resourceId;
long maxDiskLastLsn;
@@ -296,29 +296,29 @@
Map<Long, LocalResource> resourcesMap = localResourceRepository.loadAndGetAllResources();
Map<Long, Long> resourceId2MaxLSNMap = new HashMap<>();
- TxnId tempKeyTxnId = new TxnId(-1, -1, -1, null, -1, false);
+ TxnEntityId tempKeyTxnEntityId = new TxnEntityId(-1, -1, -1, null, -1, false);
ILogRecord logRecord = null;
try {
- logReader.initializeScan(lowWaterMarkLSN);
+ logReader.setPosition(lowWaterMarkLSN);
logRecord = logReader.next();
while (logRecord != null) {
if (IS_DEBUG_MODE) {
LOGGER.info(logRecord.getLogRecordForDisplay());
}
lsn = logRecord.getLSN();
- jobId = logRecord.getJobId();
+ txnId = logRecord.getTxnId();
foundWinner = false;
switch (logRecord.getLogType()) {
case LogType.UPDATE:
if (partitions.contains(logRecord.getResourcePartition())) {
- if (winnerJobSet.contains(jobId)) {
+ if (winnerTxnSet.contains(txnId)) {
foundWinner = true;
- } else if (jobId2WinnerEntitiesMap.containsKey(jobId)) {
- jobEntityWinners = jobId2WinnerEntitiesMap.get(jobId);
- tempKeyTxnId.setTxnId(jobId, logRecord.getDatasetId(), logRecord.getPKHashValue(),
+ } else if (jobId2WinnerEntitiesMap.containsKey(txnId)) {
+ jobEntityWinners = jobId2WinnerEntitiesMap.get(txnId);
+ tempKeyTxnEntityId.setTxnId(txnId, logRecord.getDatasetId(), logRecord.getPKHashValue(),
logRecord.getPKValue(), logRecord.getPKValueSize());
- if (jobEntityWinners.containsEntityCommitForTxnId(lsn, tempKeyTxnId)) {
+ if (jobEntityWinners.containsEntityCommitForTxnId(lsn, tempKeyTxnEntityId)) {
foundWinner = true;
}
}
@@ -396,6 +396,7 @@
}
LOGGER.info("Logs REDO phase completed. Redo logs count: " + redoCount);
} finally {
+ txnSubsystem.getTransactionManager().ensureMaxTxnId(txnId);
//close all indexes
Set<Long> resourceIdList = resourceId2MaxLSNMap.keySet();
for (long r : resourceIdList) {
@@ -449,9 +450,9 @@
}
@Override
- public File createJobRecoveryFile(int jobId, String fileName) throws IOException {
+ public File createJobRecoveryFile(long txnId, String fileName) throws IOException {
String recoveryDirPath = getRecoveryDirPath();
- Path jobRecoveryFolder = Paths.get(recoveryDirPath + File.separator + jobId);
+ Path jobRecoveryFolder = Paths.get(recoveryDirPath + File.separator + txnId);
if (!Files.exists(jobRecoveryFolder)) {
Files.createDirectories(jobRecoveryFolder);
}
@@ -459,10 +460,10 @@
File jobRecoveryFile = new File(jobRecoveryFolder.toString() + File.separator + fileName);
if (!jobRecoveryFile.exists()) {
if (!jobRecoveryFile.createNewFile()) {
- throw new IOException("Failed to create file: " + fileName + " for job id(" + jobId + ")");
+ throw new IOException("Failed to create file: " + fileName + " for txn id(" + txnId + ")");
}
} else {
- throw new IOException("File: " + fileName + " for job id(" + jobId + ") already exists");
+ throw new IOException("File: " + fileName + " for txn id(" + txnId + ") already exists");
}
return jobRecoveryFile;
}
@@ -483,11 +484,11 @@
return logDir + RECOVERY_FILES_DIR_NAME;
}
- private void freeJobsCachedEntities(int requestingJobId) throws IOException {
+ private void freeJobsCachedEntities(long requestingTxnId) throws IOException {
if (jobId2WinnerEntitiesMap != null) {
- for (Entry<Integer, JobEntityCommits> jobEntityCommits : jobId2WinnerEntitiesMap.entrySet()) {
+ for (Entry<Long, JobEntityCommits> jobEntityCommits : jobId2WinnerEntitiesMap.entrySet()) {
//if the job is not the requester, free its memory
- if (jobEntityCommits.getKey() != requestingJobId) {
+ if (jobEntityCommits.getKey() != requestingTxnId) {
jobEntityCommits.getValue().spillToDiskAndfreeMemory();
}
}
@@ -496,7 +497,7 @@
@Override
public void rollbackTransaction(ITransactionContext txnContext) throws ACIDException {
- int abortedJobId = txnContext.getJobId().getId();
+ long abortedTxnId = txnContext.getTxnId().getId();
// Obtain the first/last log record LSNs written by the Job
long firstLSN = txnContext.getFirstLSN();
/*
@@ -517,7 +518,7 @@
// check if the transaction actually wrote some logs.
if (firstLSN == TransactionManagementConstants.LogManagerConstants.TERMINAL_LSN || firstLSN > lastLSN) {
if (LOGGER.isLoggable(Level.INFO)) {
- LOGGER.info("no need to roll back as there were no operations by the job " + txnContext.getJobId());
+ LOGGER.info("no need to roll back as there were no operations by the txn " + txnContext.getTxnId());
}
return;
}
@@ -527,19 +528,19 @@
LOGGER.info("collecting loser transaction's LSNs from " + firstLSN + " to " + lastLSN);
}
- Map<TxnId, List<Long>> jobLoserEntity2LSNsMap = new HashMap<>();
- TxnId tempKeyTxnId = new TxnId(-1, -1, -1, null, -1, false);
+ Map<TxnEntityId, List<Long>> jobLoserEntity2LSNsMap = new HashMap<>();
+ TxnEntityId tempKeyTxnEntityId = new TxnEntityId(-1, -1, -1, null, -1, false);
int updateLogCount = 0;
int entityCommitLogCount = 0;
- int logJobId = -1;
+ long logTxnId;
long currentLSN = -1;
- TxnId loserEntity = null;
+ TxnEntityId loserEntity;
List<Long> undoLSNSet = null;
//get active partitions on this node
Set<Integer> activePartitions = localResourceRepository.getActivePartitions();
ILogReader logReader = logMgr.getLogReader(false);
try {
- logReader.initializeScan(firstLSN);
+ logReader.setPosition(firstLSN);
ILogRecord logRecord = null;
while (currentLSN < lastLSN) {
logRecord = logReader.next();
@@ -552,19 +553,20 @@
LOGGER.info(logRecord.getLogRecordForDisplay());
}
}
- logJobId = logRecord.getJobId();
- if (logJobId != abortedJobId) {
+ logTxnId = logRecord.getTxnId();
+ if (logTxnId != abortedTxnId) {
continue;
}
- tempKeyTxnId.setTxnId(logJobId, logRecord.getDatasetId(), logRecord.getPKHashValue(),
+ tempKeyTxnEntityId.setTxnId(logTxnId, logRecord.getDatasetId(), logRecord.getPKHashValue(),
logRecord.getPKValue(), logRecord.getPKValueSize());
switch (logRecord.getLogType()) {
case LogType.UPDATE:
if (activePartitions.contains(logRecord.getResourcePartition())) {
- undoLSNSet = jobLoserEntity2LSNsMap.get(tempKeyTxnId);
+ undoLSNSet = jobLoserEntity2LSNsMap.get(tempKeyTxnEntityId);
if (undoLSNSet == null) {
- loserEntity = new TxnId(logJobId, logRecord.getDatasetId(), logRecord.getPKHashValue(),
- logRecord.getPKValue(), logRecord.getPKValueSize(), true);
+ loserEntity =
+ new TxnEntityId(logTxnId, logRecord.getDatasetId(), logRecord.getPKHashValue(),
+ logRecord.getPKValue(), logRecord.getPKValueSize(), true);
undoLSNSet = new LinkedList<>();
jobLoserEntity2LSNsMap.put(loserEntity, undoLSNSet);
}
@@ -572,17 +574,17 @@
updateLogCount++;
if (IS_DEBUG_MODE) {
LOGGER.info(Thread.currentThread().getId() + "======> update[" + currentLSN + "]:"
- + tempKeyTxnId);
+ + tempKeyTxnEntityId);
}
}
break;
case LogType.ENTITY_COMMIT:
if (activePartitions.contains(logRecord.getResourcePartition())) {
- jobLoserEntity2LSNsMap.remove(tempKeyTxnId);
+ jobLoserEntity2LSNsMap.remove(tempKeyTxnEntityId);
entityCommitLogCount++;
if (IS_DEBUG_MODE) {
LOGGER.info(Thread.currentThread().getId() + "======> entity_commit[" + currentLSN + "]"
- + tempKeyTxnId);
+ + tempKeyTxnEntityId);
}
}
break;
@@ -601,7 +603,7 @@
if (currentLSN != lastLSN) {
throw new ACIDException("LastLSN mismatch: lastLSN(" + lastLSN + ") vs currentLSN(" + currentLSN
- + ") during abort( " + txnContext.getJobId() + ")");
+ + ") during abort( " + txnContext.getTxnId() + ")");
}
//undo loserTxn's effect
@@ -610,10 +612,10 @@
IDatasetLifecycleManager datasetLifecycleManager =
txnSubsystem.getAsterixAppRuntimeContextProvider().getDatasetLifecycleManager();
//TODO sort loser entities by smallest LSN to undo in one pass.
- Iterator<Entry<TxnId, List<Long>>> iter = jobLoserEntity2LSNsMap.entrySet().iterator();
+ Iterator<Entry<TxnEntityId, List<Long>>> iter = jobLoserEntity2LSNsMap.entrySet().iterator();
int undoCount = 0;
while (iter.hasNext()) {
- Map.Entry<TxnId, List<Long>> loserEntity2LSNsMap = iter.next();
+ Map.Entry<TxnEntityId, List<Long>> loserEntity2LSNsMap = iter.next();
undoLSNSet = loserEntity2LSNsMap.getValue();
// The step below is important since the upsert operations must be done in reverse order.
Collections.reverse(undoLSNSet);
@@ -622,7 +624,7 @@
//read the corresponding log record to be undone.
logRecord = logReader.read(undoLSN);
if (logRecord == null) {
- throw new ACIDException("IllegalState exception during abort( " + txnContext.getJobId() + ")");
+ throw new ACIDException("IllegalState exception during abort( " + txnContext.getTxnId() + ")");
}
if (IS_DEBUG_MODE) {
LOGGER.info(logRecord.getLogRecordForDisplay());
@@ -662,8 +664,7 @@
try {
ILSMIndex index =
(ILSMIndex) datasetLifecycleManager.getIndex(logRecord.getDatasetId(), logRecord.getResourceId());
- ILSMIndexAccessor indexAccessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor indexAccessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
if (logRecord.getNewOp() == AbstractIndexModificationOperationCallback.INSERT_BYTE) {
indexAccessor.forceDelete(logRecord.getNewValue());
} else if (logRecord.getNewOp() == AbstractIndexModificationOperationCallback.DELETE_BYTE) {
@@ -696,8 +697,7 @@
int datasetId = logRecord.getDatasetId();
long resourceId = logRecord.getResourceId();
ILSMIndex index = (ILSMIndex) datasetLifecycleManager.getIndex(datasetId, resourceId);
- ILSMIndexAccessor indexAccessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor indexAccessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
if (logRecord.getNewOp() == AbstractIndexModificationOperationCallback.INSERT_BYTE) {
indexAccessor.forceInsert(logRecord.getNewValue());
} else if (logRecord.getNewOp() == AbstractIndexModificationOperationCallback.DELETE_BYTE) {
@@ -715,25 +715,25 @@
private class JobEntityCommits {
private static final String PARTITION_FILE_NAME_SEPARATOR = "_";
- private final int jobId;
- private final Set<TxnId> cachedEntityCommitTxns = new HashSet<>();
+ private final long txnId;
+ private final Set<TxnEntityId> cachedEntityCommitTxns = new HashSet<>();
private final List<File> jobEntitCommitOnDiskPartitionsFiles = new ArrayList<>();
//a flag indicating whether all the the commits for this jobs have been added.
private boolean preparedForSearch = false;
- private TxnId winnerEntity = null;
+ private TxnEntityId winnerEntity = null;
private int currentPartitionSize = 0;
private long partitionMaxLSN = 0;
private String currentPartitonName;
- public JobEntityCommits(int jobId) {
- this.jobId = jobId;
+ public JobEntityCommits(long txnId) {
+ this.txnId = txnId;
}
public void add(ILogRecord logRecord) throws IOException {
if (preparedForSearch) {
throw new IOException("Cannot add new entity commits after preparing for search.");
}
- winnerEntity = new TxnId(logRecord.getJobId(), logRecord.getDatasetId(), logRecord.getPKHashValue(),
+ winnerEntity = new TxnEntityId(logRecord.getTxnId(), logRecord.getDatasetId(), logRecord.getPKHashValue(),
logRecord.getPKValue(), logRecord.getPKValueSize(), true);
cachedEntityCommitTxns.add(winnerEntity);
//since log file is read sequentially, LSNs are always increasing
@@ -774,15 +774,15 @@
preparedForSearch = true;
}
- public boolean containsEntityCommitForTxnId(long logLSN, TxnId txnId) throws IOException {
+ public boolean containsEntityCommitForTxnId(long logLSN, TxnEntityId txnEntityId) throws IOException {
//if we don't have any partitions on disk, search only from memory
if (jobEntitCommitOnDiskPartitionsFiles.size() == 0) {
- return cachedEntityCommitTxns.contains(txnId);
+ return cachedEntityCommitTxns.contains(txnEntityId);
} else {
//get candidate partitions from disk
ArrayList<File> candidatePartitions = getCandidiatePartitions(logLSN);
for (File partition : candidatePartitions) {
- if (serachPartition(partition, txnId)) {
+ if (serachPartition(partition, txnEntityId)) {
return true;
}
}
@@ -816,17 +816,17 @@
jobEntitCommitOnDiskPartitionsFiles.clear();
}
- private boolean serachPartition(File partition, TxnId txnId) throws IOException {
+ private boolean serachPartition(File partition, TxnEntityId txnEntityId) throws IOException {
//load partition from disk if it is not already in memory
if (!partition.getName().equals(currentPartitonName)) {
loadPartitionToMemory(partition, cachedEntityCommitTxns);
currentPartitonName = partition.getName();
}
- return cachedEntityCommitTxns.contains(txnId);
+ return cachedEntityCommitTxns.contains(txnEntityId);
}
private String getPartitionName(long maxLSN) {
- return jobId + PARTITION_FILE_NAME_SEPARATOR + maxLSN;
+ return txnId + PARTITION_FILE_NAME_SEPARATOR + maxLSN;
}
private long getPartitionMaxLSNFromName(String partitionName) {
@@ -837,18 +837,18 @@
//if we don't have enough memory to allocate for this partition,
// we will ask recovery manager to free memory
if (needToFreeMemory()) {
- freeJobsCachedEntities(jobId);
+ freeJobsCachedEntities(txnId);
}
//allocate a buffer that can hold the current partition
ByteBuffer buffer = ByteBuffer.allocate(currentPartitionSize);
- for (Iterator<TxnId> iterator = cachedEntityCommitTxns.iterator(); iterator.hasNext();) {
- TxnId txnId = iterator.next();
+ for (Iterator<TxnEntityId> iterator = cachedEntityCommitTxns.iterator(); iterator.hasNext();) {
+ TxnEntityId txnEntityId = iterator.next();
//serialize the object and remove it from memory
- txnId.serialize(buffer);
+ txnEntityId.serialize(buffer);
iterator.remove();
}
//name partition file based on job id and max lsn
- File partitionFile = createJobRecoveryFile(jobId, getPartitionName(partitionMaxLSN));
+ File partitionFile = createJobRecoveryFile(txnId, getPartitionName(partitionMaxLSN));
//write file to disk
try (FileOutputStream fileOutputstream = new FileOutputStream(partitionFile, false);
FileChannel fileChannel = fileOutputstream.getChannel()) {
@@ -860,11 +860,11 @@
jobEntitCommitOnDiskPartitionsFiles.add(partitionFile);
}
- private void loadPartitionToMemory(File partition, Set<TxnId> partitionTxn) throws IOException {
+ private void loadPartitionToMemory(File partition, Set<TxnEntityId> partitionTxn) throws IOException {
partitionTxn.clear();
//if we don't have enough memory to a load partition, we will ask recovery manager to free memory
if (needToFreeMemory()) {
- freeJobsCachedEntities(jobId);
+ freeJobsCachedEntities(txnId);
}
ByteBuffer buffer = ByteBuffer.allocateDirect((int) partition.length());
//load partition to memory
@@ -875,9 +875,9 @@
}
}
buffer.flip();
- TxnId temp = null;
+ TxnEntityId temp;
while (buffer.remaining() != 0) {
- temp = TxnId.deserialize(buffer);
+ temp = TxnEntityId.deserialize(buffer);
partitionTxn.add(temp);
}
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java
index 4752481..f922832 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/TransactionSubsystem.java
@@ -80,10 +80,13 @@
}
checkpointManager = CheckpointManagerFactory.create(this, checkpointProperties, replicationEnabled);
final Checkpoint latestCheckpoint = checkpointManager.getLatest();
- if (latestCheckpoint != null && latestCheckpoint.getStorageVersion() != StorageConstants.VERSION) {
- throw new IllegalStateException(
- String.format("Storage version mismatch. Current version (%s). On disk version: (%s)",
- StorageConstants.VERSION, latestCheckpoint.getStorageVersion()));
+ if (latestCheckpoint != null) {
+ if (latestCheckpoint.getStorageVersion() != StorageConstants.VERSION) {
+ throw new IllegalStateException(
+ String.format("Storage version mismatch. Current version (%s). On disk version: (%s)",
+ StorageConstants.VERSION, latestCheckpoint.getStorageVersion()));
+ }
+ transactionManager.ensureMaxTxnId(latestCheckpoint.getMaxTxnId());
}
if (replicationEnabled) {
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/ReportMaxResourceIdTask.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/ReportLocalCountersTask.java
similarity index 87%
rename from asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/ReportMaxResourceIdTask.java
rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/ReportLocalCountersTask.java
index 22d3cde..86f7d1c 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/ReportMaxResourceIdTask.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/nc/task/ReportLocalCountersTask.java
@@ -19,18 +19,18 @@
package org.apache.asterix.app.nc.task;
import org.apache.asterix.common.api.INCLifecycleTask;
-import org.apache.asterix.runtime.message.ReportMaxResourceIdMessage;
+import org.apache.asterix.runtime.message.ReportLocalCountersMessage;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.service.IControllerService;
import org.apache.hyracks.control.nc.NodeControllerService;
-public class ReportMaxResourceIdTask implements INCLifecycleTask {
+public class ReportLocalCountersTask implements INCLifecycleTask {
private static final long serialVersionUID = 1L;
@Override
public void perform(IControllerService cs) throws HyracksDataException {
- ReportMaxResourceIdMessage.send((NodeControllerService) cs);
+ ReportLocalCountersMessage.send((NodeControllerService) cs);
}
@Override
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java
index 4ac1305..23f225e 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/AutoFaultToleranceStrategy.java
@@ -33,7 +33,7 @@
import org.apache.asterix.app.nc.task.CheckpointTask;
import org.apache.asterix.app.nc.task.ExternalLibrarySetupTask;
import org.apache.asterix.app.nc.task.MetadataBootstrapTask;
-import org.apache.asterix.app.nc.task.ReportMaxResourceIdTask;
+import org.apache.asterix.app.nc.task.ReportLocalCountersTask;
import org.apache.asterix.app.nc.task.StartFailbackTask;
import org.apache.asterix.app.nc.task.StartLifecycleComponentsTask;
import org.apache.asterix.app.nc.task.StartReplicationServiceTask;
@@ -43,8 +43,8 @@
import org.apache.asterix.app.replication.message.NCLifecycleTaskReportMessage;
import org.apache.asterix.app.replication.message.PreparePartitionsFailbackRequestMessage;
import org.apache.asterix.app.replication.message.PreparePartitionsFailbackResponseMessage;
-import org.apache.asterix.app.replication.message.StartupTaskRequestMessage;
-import org.apache.asterix.app.replication.message.StartupTaskResponseMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksRequestMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksResponseMessage;
import org.apache.asterix.app.replication.message.TakeoverMetadataNodeRequestMessage;
import org.apache.asterix.app.replication.message.TakeoverMetadataNodeResponseMessage;
import org.apache.asterix.app.replication.message.TakeoverPartitionsRequestMessage;
@@ -431,10 +431,10 @@
@Override
public synchronized void process(INCLifecycleMessage message) throws HyracksDataException {
switch (message.getType()) {
- case STARTUP_TASK_REQUEST:
- process((StartupTaskRequestMessage) message);
+ case REGISTRATION_TASKS_REQUEST:
+ process((RegistrationTasksRequestMessage) message);
break;
- case STARTUP_TASK_RESULT:
+ case REGISTRATION_TASKS_RESULT:
process((NCLifecycleTaskReportMessage) message);
break;
case TAKEOVER_PARTITION_RESPONSE:
@@ -483,7 +483,7 @@
currentMetadataNode = clusterManager.getCurrentMetadataNodeId();
}
- private synchronized void process(StartupTaskRequestMessage msg) throws HyracksDataException {
+ private synchronized void process(RegistrationTasksRequestMessage msg) throws HyracksDataException {
final String nodeId = msg.getNodeId();
final SystemState state = msg.getState();
List<INCLifecycleTask> tasks;
@@ -493,7 +493,7 @@
// failed node returned. Need to start failback process
tasks = buildFailbackStartupSequence();
}
- StartupTaskResponseMessage response = new StartupTaskResponseMessage(nodeId, tasks);
+ RegistrationTasksResponseMessage response = new RegistrationTasksResponseMessage(nodeId, tasks);
try {
messageBroker.sendApplicationMessageToNC(response, msg.getNodeId());
} catch (Exception e) {
@@ -504,7 +504,7 @@
private List<INCLifecycleTask> buildFailbackStartupSequence() {
final List<INCLifecycleTask> tasks = new ArrayList<>();
tasks.add(new StartFailbackTask());
- tasks.add(new ReportMaxResourceIdTask());
+ tasks.add(new ReportLocalCountersTask());
tasks.add(new StartLifecycleComponentsTask());
return tasks;
}
@@ -517,7 +517,7 @@
tasks.add(new MetadataBootstrapTask());
}
tasks.add(new ExternalLibrarySetupTask(isMetadataNode));
- tasks.add(new ReportMaxResourceIdTask());
+ tasks.add(new ReportLocalCountersTask());
tasks.add(new CheckpointTask());
tasks.add(new StartLifecycleComponentsTask());
if (isMetadataNode) {
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java
index 1b57403..3341813 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/MetadataNodeFaultToleranceStrategy.java
@@ -35,14 +35,14 @@
import org.apache.asterix.app.nc.task.LocalRecoveryTask;
import org.apache.asterix.app.nc.task.MetadataBootstrapTask;
import org.apache.asterix.app.nc.task.RemoteRecoveryTask;
-import org.apache.asterix.app.nc.task.ReportMaxResourceIdTask;
+import org.apache.asterix.app.nc.task.ReportLocalCountersTask;
import org.apache.asterix.app.nc.task.StartLifecycleComponentsTask;
import org.apache.asterix.app.nc.task.StartReplicationServiceTask;
import org.apache.asterix.app.replication.message.NCLifecycleTaskReportMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksRequestMessage;
import org.apache.asterix.app.replication.message.ReplayPartitionLogsRequestMessage;
import org.apache.asterix.app.replication.message.ReplayPartitionLogsResponseMessage;
-import org.apache.asterix.app.replication.message.StartupTaskRequestMessage;
-import org.apache.asterix.app.replication.message.StartupTaskResponseMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksResponseMessage;
import org.apache.asterix.common.api.INCLifecycleTask;
import org.apache.asterix.common.cluster.ClusterPartition;
import org.apache.asterix.common.cluster.IClusterStateManager;
@@ -123,10 +123,10 @@
@Override
public synchronized void process(INCLifecycleMessage message) throws HyracksDataException {
switch (message.getType()) {
- case STARTUP_TASK_REQUEST:
- process((StartupTaskRequestMessage) message);
+ case REGISTRATION_TASKS_REQUEST:
+ process((RegistrationTasksRequestMessage) message);
break;
- case STARTUP_TASK_RESULT:
+ case REGISTRATION_TASKS_RESULT:
process((NCLifecycleTaskReportMessage) message);
break;
case REPLAY_LOGS_RESPONSE:
@@ -150,7 +150,7 @@
}
}
- private synchronized void process(StartupTaskRequestMessage msg) throws HyracksDataException {
+ private synchronized void process(RegistrationTasksRequestMessage msg) throws HyracksDataException {
final String nodeId = msg.getNodeId();
final SystemState state = msg.getState();
final boolean isParticipant = replicationStrategy.isParticipant(nodeId);
@@ -160,7 +160,7 @@
} else {
tasks = buildParticipantStartupSequence(nodeId, state);
}
- StartupTaskResponseMessage response = new StartupTaskResponseMessage(nodeId, tasks);
+ RegistrationTasksResponseMessage response = new RegistrationTasksResponseMessage(nodeId, tasks);
try {
messageBroker.sendApplicationMessageToNC(response, msg.getNodeId());
} catch (Exception e) {
@@ -199,7 +199,7 @@
tasks.add(rt);
}
tasks.add(new ExternalLibrarySetupTask(false));
- tasks.add(new ReportMaxResourceIdTask());
+ tasks.add(new ReportLocalCountersTask());
tasks.add(new CheckpointTask());
tasks.add(new StartLifecycleComponentsTask());
return tasks;
@@ -234,7 +234,7 @@
tasks.add(new MetadataBootstrapTask());
}
tasks.add(new ExternalLibrarySetupTask(isMetadataNode));
- tasks.add(new ReportMaxResourceIdTask());
+ tasks.add(new ReportLocalCountersTask());
tasks.add(new CheckpointTask());
tasks.add(new StartLifecycleComponentsTask());
if (isMetadataNode) {
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java
index b9ea135..a273845 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/NoFaultToleranceStrategy.java
@@ -32,11 +32,11 @@
import org.apache.asterix.app.nc.task.ExternalLibrarySetupTask;
import org.apache.asterix.app.nc.task.LocalRecoveryTask;
import org.apache.asterix.app.nc.task.MetadataBootstrapTask;
-import org.apache.asterix.app.nc.task.ReportMaxResourceIdTask;
+import org.apache.asterix.app.nc.task.ReportLocalCountersTask;
import org.apache.asterix.app.nc.task.StartLifecycleComponentsTask;
import org.apache.asterix.app.replication.message.NCLifecycleTaskReportMessage;
-import org.apache.asterix.app.replication.message.StartupTaskRequestMessage;
-import org.apache.asterix.app.replication.message.StartupTaskResponseMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksRequestMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksResponseMessage;
import org.apache.asterix.common.api.INCLifecycleTask;
import org.apache.asterix.common.cluster.ClusterPartition;
import org.apache.asterix.common.cluster.IClusterStateManager;
@@ -48,12 +48,13 @@
import org.apache.asterix.common.replication.IReplicationStrategy;
import org.apache.asterix.common.transactions.IRecoveryManager.SystemState;
import org.apache.hyracks.api.application.ICCServiceContext;
+import org.apache.hyracks.api.client.NodeStatus;
import org.apache.hyracks.api.exceptions.HyracksDataException;
public class NoFaultToleranceStrategy implements IFaultToleranceStrategy {
private static final Logger LOGGER = Logger.getLogger(NoFaultToleranceStrategy.class.getName());
- IClusterStateManager clusterManager;
+ private IClusterStateManager clusterManager;
private String metadataNodeId;
private Set<String> pendingStartupCompletionNodes = new HashSet<>();
private ICCMessageBroker messageBroker;
@@ -76,10 +77,10 @@
@Override
public void process(INCLifecycleMessage message) throws HyracksDataException {
switch (message.getType()) {
- case STARTUP_TASK_REQUEST:
- process((StartupTaskRequestMessage) message);
+ case REGISTRATION_TASKS_REQUEST:
+ process((RegistrationTasksRequestMessage) message);
break;
- case STARTUP_TASK_RESULT:
+ case REGISTRATION_TASKS_RESULT:
process((NCLifecycleTaskReportMessage) message);
break;
default:
@@ -100,10 +101,10 @@
metadataNodeId = clusterManager.getCurrentMetadataNodeId();
}
- private void process(StartupTaskRequestMessage msg) throws HyracksDataException {
+ private void process(RegistrationTasksRequestMessage msg) throws HyracksDataException {
final String nodeId = msg.getNodeId();
- List<INCLifecycleTask> tasks = buildNCStartupSequence(msg.getNodeId(), msg.getState());
- StartupTaskResponseMessage response = new StartupTaskResponseMessage(nodeId, tasks);
+ List<INCLifecycleTask> tasks = buildNCRegTasks(msg.getNodeId(), msg.getNodeStatus(), msg.getState());
+ RegistrationTasksResponseMessage response = new RegistrationTasksResponseMessage(nodeId, tasks);
try {
messageBroker.sendApplicationMessageToNC(response, msg.getNodeId());
} catch (Exception e) {
@@ -126,7 +127,16 @@
}
}
- private List<INCLifecycleTask> buildNCStartupSequence(String nodeId, SystemState state) {
+ private List<INCLifecycleTask> buildNCRegTasks(String nodeId, NodeStatus nodeStatus, SystemState state) {
+ LOGGER.log(Level.INFO, () -> "Building registration tasks for node: " + nodeId + " with state: " + state);
+ final boolean isMetadataNode = nodeId.equals(metadataNodeId);
+ if (nodeStatus == NodeStatus.ACTIVE) {
+ /*
+ * if the node state is already ACTIVE then it completed
+ * booting and just re-registering with a new/failed CC.
+ */
+ return buildActiveNCRegTasks(isMetadataNode);
+ }
final List<INCLifecycleTask> tasks = new ArrayList<>();
if (state == SystemState.CORRUPTED) {
//need to perform local recovery for node partitions
@@ -134,12 +144,11 @@
.stream().map(ClusterPartition::getPartitionId).collect(Collectors.toSet()));
tasks.add(rt);
}
- final boolean isMetadataNode = nodeId.equals(metadataNodeId);
if (isMetadataNode) {
tasks.add(new MetadataBootstrapTask());
}
tasks.add(new ExternalLibrarySetupTask(isMetadataNode));
- tasks.add(new ReportMaxResourceIdTask());
+ tasks.add(new ReportLocalCountersTask());
tasks.add(new CheckpointTask());
tasks.add(new StartLifecycleComponentsTask());
if (isMetadataNode) {
@@ -147,4 +156,15 @@
}
return tasks;
}
+
+ private List<INCLifecycleTask> buildActiveNCRegTasks(boolean metadataNode) {
+ final List<INCLifecycleTask> tasks = new ArrayList<>();
+ if (metadataNode) {
+ // need to unbind from old distributed state then rebind to new one
+ tasks.add(new BindMetadataNodeTask(false));
+ tasks.add(new BindMetadataNodeTask(true));
+ }
+ tasks.add(new ReportLocalCountersTask());
+ return tasks;
+ }
}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java
index 2b32e1f..b654fd8 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/NCLifecycleTaskReportMessage.java
@@ -58,6 +58,6 @@
@Override
public MessageType getType() {
- return MessageType.STARTUP_TASK_RESULT;
+ return MessageType.REGISTRATION_TASKS_RESULT;
}
}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskRequestMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java
similarity index 69%
rename from asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskRequestMessage.java
rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java
index 21dee9c..075c415 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskRequestMessage.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksRequestMessage.java
@@ -26,27 +26,32 @@
import org.apache.asterix.common.messaging.api.INCMessageBroker;
import org.apache.asterix.common.replication.INCLifecycleMessage;
import org.apache.asterix.common.transactions.IRecoveryManager.SystemState;
+import org.apache.hyracks.api.client.NodeStatus;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.control.nc.NodeControllerService;
-public class StartupTaskRequestMessage implements INCLifecycleMessage, ICcAddressedMessage {
+public class RegistrationTasksRequestMessage implements INCLifecycleMessage, ICcAddressedMessage {
- private static final Logger LOGGER = Logger.getLogger(StartupTaskRequestMessage.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(RegistrationTasksRequestMessage.class.getName());
private static final long serialVersionUID = 1L;
private final SystemState state;
private final String nodeId;
+ private final NodeStatus nodeStatus;
- public StartupTaskRequestMessage(String nodeId, SystemState state) {
+ public RegistrationTasksRequestMessage(String nodeId, NodeStatus nodeStatus, SystemState state) {
this.state = state;
this.nodeId = nodeId;
+ this.nodeStatus = nodeStatus;
}
- public static void send(NodeControllerService cs, SystemState systemState) throws HyracksDataException {
+ public static void send(NodeControllerService cs, NodeStatus nodeStatus, SystemState systemState)
+ throws HyracksDataException {
try {
- StartupTaskRequestMessage msg = new StartupTaskRequestMessage(cs.getId(), systemState);
+ RegistrationTasksRequestMessage msg = new RegistrationTasksRequestMessage(cs.getId(), nodeStatus,
+ systemState);
((INCMessageBroker) cs.getContext().getMessageBroker()).sendMessageToCC(msg);
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Unable to send StartupTaskRequestMessage to CC", e);
+ LOGGER.log(Level.SEVERE, "Unable to send RegistrationTasksRequestMessage to CC", e);
throw HyracksDataException.create(e);
}
}
@@ -64,8 +69,13 @@
return nodeId;
}
+ public NodeStatus getNodeStatus() {
+ return nodeStatus;
+ }
+
@Override
public MessageType getType() {
- return MessageType.STARTUP_TASK_REQUEST;
+ return MessageType.REGISTRATION_TASKS_REQUEST;
}
+
}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java
similarity index 90%
rename from asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java
rename to asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java
index b941343..13525e3 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/StartupTaskResponseMessage.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/replication/message/RegistrationTasksResponseMessage.java
@@ -32,14 +32,14 @@
import org.apache.hyracks.control.nc.NCShutdownHook;
import org.apache.hyracks.util.ExitUtil;
-public class StartupTaskResponseMessage implements INCLifecycleMessage, INcAddressedMessage {
+public class RegistrationTasksResponseMessage implements INCLifecycleMessage, INcAddressedMessage {
- private static final Logger LOGGER = Logger.getLogger(StartupTaskResponseMessage.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(RegistrationTasksResponseMessage.class.getName());
private static final long serialVersionUID = 1L;
private final String nodeId;
private final List<INCLifecycleTask> tasks;
- public StartupTaskResponseMessage(String nodeId, List<INCLifecycleTask> tasks) {
+ public RegistrationTasksResponseMessage(String nodeId, List<INCLifecycleTask> tasks) {
this.nodeId = nodeId;
this.tasks = tasks;
}
@@ -88,6 +88,6 @@
@Override
public MessageType getType() {
- return MessageType.STARTUP_TASK_RESPONSE;
+ return MessageType.REGISTRATION_TASKS_RESPONSE;
}
}
\ No newline at end of file
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 e45df8b..2fc3258 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
@@ -265,9 +265,11 @@
FileSplit outputFile = null;
IAWriterFactory writerFactory = PrinterBasedWriterFactory.INSTANCE;
IResultSerializerFactoryProvider resultSerializerFactoryProvider = ResultSerializerFactoryProvider.INSTANCE;
- /* Since the system runs a large number of threads, when HTTP requests don't return, it becomes difficult to
- * find the thread running the request to determine where it has stopped.
- * Setting the thread name helps make that easier
+ /*
+ * Since the system runs a large number of threads, when HTTP requests don't
+ * return, it becomes difficult to find the thread running the request to
+ * determine where it has stopped. Setting the thread name helps make that
+ * easier
*/
String threadName = Thread.currentThread().getName();
Thread.currentThread().setName(QueryTranslator.class.getSimpleName());
@@ -397,8 +399,8 @@
// No op
break;
case Statement.Kind.EXTENSION:
- ((IExtensionStatement) stmt)
- .handle(hcc, this, requestParameters, metadataProvider, resultSetIdCounter);
+ ((IExtensionStatement) stmt).handle(hcc, this, requestParameters, metadataProvider,
+ resultSetIdCounter);
break;
default:
throw new CompilationException("Unknown function");
@@ -527,8 +529,6 @@
String compactionPolicy = dd.getCompactionPolicy();
Map<String, String> compactionPolicyProperties = dd.getCompactionPolicyProperties();
boolean defaultCompactionPolicy = compactionPolicy == null;
- boolean temp = dd.getDatasetDetailsDecl().isTemp();
-
MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
boolean bActiveTxn = true;
metadataProvider.setMetadataTxnContext(mdTxnCtx);
@@ -600,7 +600,7 @@
}
datasetDetails = new InternalDatasetDetails(InternalDatasetDetails.FileStructure.BTREE,
InternalDatasetDetails.PartitioningStrategy.HASH, partitioningExprs, partitioningExprs,
- keySourceIndicators, partitioningTypes, autogenerated, filterField, temp);
+ keySourceIndicators, partitioningTypes, autogenerated, filterField);
break;
case EXTERNAL:
String adapter = ((ExternalDetailsDecl) dd.getDatasetDetailsDecl()).getAdapter();
@@ -641,7 +641,8 @@
metadataProvider.setMetadataTxnContext(mdTxnCtx);
}
- // #. add a new dataset with PendingNoOp after deleting the dataset with PendingAddOp
+ // #. add a new dataset with PendingNoOp after deleting the dataset with
+ // PendingAddOp
MetadataManager.INSTANCE.dropDataset(metadataProvider.getMetadataTxnContext(), dataverseName, datasetName);
dataset.setPendingOp(MetadataUtil.PENDING_NO_OP);
MetadataManager.INSTANCE.addDataset(metadataProvider.getMetadataTxnContext(), dataset);
@@ -656,7 +657,8 @@
// #. execute compensation operations
// remove the index in NC
// [Notice]
- // As long as we updated(and committed) metadata, we should remove any effect of the job
+ // As long as we updated(and committed) metadata, we should remove any effect of
+ // the job
// because an exception occurs during runJob.
mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
bActiveTxn = true;
@@ -740,7 +742,7 @@
return DatasetUtil.createNodeGroupForNewDataset(dataverseName, datasetName, selectedNodes, metadataProvider);
}
- protected void handleCreateIndexStatement(MetadataProvider metadataProvider, Statement stmt,
+ public void handleCreateIndexStatement(MetadataProvider metadataProvider, Statement stmt,
IHyracksClientConnection hcc, IRequestParameters requestParameters) throws Exception {
CreateIndexStatement stmtCreateIndex = (CreateIndexStatement) stmt;
String dataverseName = getActiveDataverse(stmtCreateIndex.getDataverseName());
@@ -790,9 +792,11 @@
int keyIndex = 0;
boolean overridesFieldTypes = false;
- // this set is used to detect duplicates in the specified keys in the create index statement
+ // this set is used to detect duplicates in the specified keys in the create
+ // index statement
// e.g. CREATE INDEX someIdx on dataset(id,id).
- // checking only the names is not enough. Need also to check the source indicators for cases like:
+ // checking only the names is not enough. Need also to check the source
+ // indicators for cases like:
// CREATE INDEX someIdx on dataset(meta().id, id)
Set<Pair<List<String>, Integer>> indexKeysSet = new HashSet<>();
@@ -820,10 +824,11 @@
throw new AsterixException(ErrorCode.INDEX_ILLEGAL_ENFORCED_NON_OPTIONAL,
String.valueOf(fieldExpr.first));
}
- // don't allow creating an enforced index on a closed-type field, fields that are part of schema.
+ // don't allow creating an enforced index on a closed-type field, fields that
+ // are part of schema.
// get the field type, if it's not null, then the field is closed-type
- if (stmtCreateIndex.isEnforced() &&
- subType.getSubFieldType(fieldExpr.first.subList(i, fieldExpr.first.size())) != null) {
+ if (stmtCreateIndex.isEnforced()
+ && subType.getSubFieldType(fieldExpr.first.subList(i, fieldExpr.first.size())) != null) {
throw new AsterixException(ErrorCode.INDEX_ILLEGAL_ENFORCED_ON_CLOSED_FIELD,
String.valueOf(fieldExpr.first));
}
@@ -845,9 +850,10 @@
"Unknown type " + (fieldExpr.second == null ? fieldExpr.first : fieldExpr.second));
}
- // try to add the key & its source to the set of keys, if key couldn't be added, there is a duplicate
- if (!indexKeysSet.add(new Pair<>(fieldExpr.first,
- stmtCreateIndex.getFieldSourceIndicators().get(keyIndex)))) {
+ // try to add the key & its source to the set of keys, if key couldn't be added,
+ // there is a duplicate
+ if (!indexKeysSet
+ .add(new Pair<>(fieldExpr.first, stmtCreateIndex.getFieldSourceIndicators().get(keyIndex)))) {
throw new AsterixException(ErrorCode.INDEX_ILLEGAL_REPETITIVE_FIELD,
String.valueOf(fieldExpr.first));
}
@@ -859,9 +865,11 @@
validateIndexKeyFields(stmtCreateIndex, keySourceIndicators, aRecordType, metaRecordType, indexFields,
indexFieldTypes);
- // Checks whether a user is trying to create an inverted secondary index on a dataset
+ // Checks whether a user is trying to create an inverted secondary index on a
+ // dataset
// with a variable-length primary key.
- // Currently, we do not support this. Therefore, as a temporary solution, we print an
+ // Currently, we do not support this. Therefore, as a temporary solution, we
+ // print an
// error message and stop.
if (stmtCreateIndex.getIndexType() == IndexType.SINGLE_PARTITION_WORD_INVIX
|| stmtCreateIndex.getIndexType() == IndexType.SINGLE_PARTITION_NGRAM_INVIX
@@ -993,8 +1001,13 @@
// #. create the index artifact in NC.
runJob(hcc, spec, jobFlags);
- // #. flush the internal dataset for correlated policy
- if (ds.isCorrelated() && ds.getDatasetType() == DatasetType.INTERNAL) {
+ // #. flush the internal dataset
+ // We need this to guarantee the correctness of component Id acceleration for
+ // secondary-to-primary index.
+ // Otherwise, the new secondary index component would corresponding to a partial
+ // memory component
+ // of the primary index, which is incorrect.
+ if (ds.getDatasetType() == DatasetType.INTERNAL) {
FlushDatasetUtil.flushDataset(hcc, metadataProvider, index.getDataverseName(), index.getDatasetName());
}
@@ -1014,7 +1027,8 @@
bActiveTxn = true;
metadataProvider.setMetadataTxnContext(mdTxnCtx);
- // #. add another new index with PendingNoOp after deleting the index with PendingAddOp
+ // #. add another new index with PendingNoOp after deleting the index with
+ // PendingAddOp
MetadataManager.INSTANCE.dropIndex(metadataProvider.getMetadataTxnContext(), index.getDataverseName(),
index.getDatasetName(), index.getIndexName());
index.setPendingOp(MetadataUtil.PENDING_NO_OP);
@@ -1035,7 +1049,8 @@
if (bActiveTxn) {
abort(e, e, mdTxnCtx);
}
- // If files index was replicated for external dataset, it should be cleaned up on NC side
+ // If files index was replicated for external dataset, it should be cleaned up
+ // on NC side
if (filesIndexReplicated) {
mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
bActiveTxn = true;
@@ -1655,9 +1670,9 @@
protected void handleCreateFunctionStatement(MetadataProvider metadataProvider, Statement stmt) throws Exception {
CreateFunctionStatement cfs = (CreateFunctionStatement) stmt;
- String dataverse = getActiveDataverseName(cfs.getSignature().getNamespace());
- cfs.getSignature().setNamespace(dataverse);
- String functionName = cfs.getaAterixFunction().getName();
+ String dataverse = getActiveDataverseName(cfs.getFunctionSignature().getNamespace());
+ cfs.getFunctionSignature().setNamespace(dataverse);
+ String functionName = cfs.getFunctionSignature().getName();
MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
metadataProvider.setMetadataTxnContext(mdTxnCtx);
@@ -1668,7 +1683,7 @@
if (dv == null) {
throw new AlgebricksException("There is no dataverse with this name " + dataverse + ".");
}
- Function function = new Function(dataverse, functionName, cfs.getaAterixFunction().getArity(),
+ Function function = new Function(dataverse, functionName, cfs.getFunctionSignature().getArity(),
cfs.getParamList(), Function.RETURNTYPE_VOID, cfs.getFunctionBody(),
rewriterFactory instanceof SqlppRewriterFactory ? Function.LANGUAGE_SQLPP : Function.LANGUAGE_AQL,
FunctionKind.SCALAR.toString());
@@ -1684,7 +1699,7 @@
}
protected boolean checkWhetherFunctionIsBeingUsed(MetadataTransactionContext ctx, String dataverseName,
- String functionName, int arity, String currentDataverse) throws MetadataException {
+ String functionName, int arity, String currentDataverse) throws AlgebricksException {
List<Dataverse> allDataverses = MetadataManager.INSTANCE.getDataverses(ctx);
for (Dataverse dataverse : allDataverses) {
if (currentDataverse != null && dataverse.getDataverseName().equals(currentDataverse)) {
@@ -1768,7 +1783,7 @@
String dataverseName = getActiveDataverse(stmtInsertUpsert.getDataverseName());
final IMetadataLocker locker = new IMetadataLocker() {
@Override
- public void lock() throws AsterixException {
+ public void lock() throws AlgebricksException {
MetadataLockUtil.insertDeleteUpsertBegin(lockManager, metadataProvider.getLocks(),
dataverseName + "." + stmtInsertUpsert.getDatasetName());
}
@@ -1873,7 +1888,8 @@
MetadataProvider metadataProvider, InsertStatement insertUpsert)
throws RemoteException, AlgebricksException, ACIDException {
- // Insert/upsert statement rewriting (happens under the same ongoing metadata transaction)
+ // Insert/upsert statement rewriting (happens under the same ongoing metadata
+ // transaction)
Pair<IReturningStatement, Integer> rewrittenResult =
apiFramework.reWriteQuery(declaredFunctions, metadataProvider, insertUpsert, sessionOutput);
@@ -1895,7 +1911,8 @@
default:
throw new AlgebricksException("Unsupported statement type " + rewrittenInsertUpsert.getKind());
}
- // Insert/upsert statement compilation (happens under the same ongoing metadata transaction)
+ // Insert/upsert statement compilation (happens under the same ongoing metadata
+ // transaction)
return apiFramework.compileQuery(clusterInfoCollector, metadataProvider, rewrittenInsertUpsert.getQuery(),
rewrittenResult.second, datasetName, sessionOutput, clfrqs);
}
@@ -2307,9 +2324,9 @@
}
private interface IMetadataLocker {
- void lock() throws AsterixException;
+ void lock() throws AlgebricksException;
- void unlock() throws AsterixException;
+ void unlock() throws AlgebricksException;
}
private interface IResultPrinter {
@@ -2376,6 +2393,8 @@
createAndRunJob(hcc, jobFlags, null, compiler, locker, resultDelivery, id -> {
final ResultReader resultReader = new ResultReader(hdc, id, resultSetId);
updateJobStats(id, stats);
+ // stop buffering and allow for streaming result delivery
+ sessionOutput.release();
ResultUtil.printResults(appCtx, resultReader, sessionOutput, stats,
metadataProvider.findOutputRecordType());
}, clientContextId, ctx);
@@ -2624,7 +2643,8 @@
// all index updates has completed successfully, record transaction state
spec = ExternalIndexingOperations.buildCommitJob(ds, indexes, metadataProvider);
- // Aquire write latch again -> start a transaction and record the decision to commit
+ // Aquire write latch again -> start a transaction and record the decision to
+ // commit
mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
metadataProvider.setMetadataTxnContext(mdTxnCtx);
bActiveTxn = true;
@@ -2852,7 +2872,7 @@
new DropDatasetStatement(new Identifier(dataverseNameTo), pregelixStmt.getDatasetNameTo(), true);
this.handleDatasetDropStatement(metadataProvider, dropStmt, hcc, null);
IDatasetDetailsDecl idd = new InternalDetailsDecl(toIndex.getKeyFieldNames(),
- toIndex.getKeyFieldSourceIndicators(), false, null, toDataset.getDatasetDetails().isTemp());
+ toIndex.getKeyFieldSourceIndicators(), false, null);
DatasetDecl createToDataset = new DatasetDecl(new Identifier(dataverseNameTo),
pregelixStmt.getDatasetNameTo(), new Identifier(toDataset.getItemTypeDataverseName()),
new Identifier(toDataset.getItemTypeName()),
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java
index 84f841c..50fe65e 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/ClusterLifecycleListener.java
@@ -183,7 +183,7 @@
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Added NC at:" + node.getId());
}
- } catch (AsterixException e) {
+ } catch (Exception e) {
if (LOGGER.isLoggable(Level.WARNING)) {
LOGGER.warning("Unable to add NC at:" + node.getId());
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
index 3d7f870..63f5bfc 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/hyracks/bootstrap/NCApplication.java
@@ -26,7 +26,7 @@
import java.util.logging.Logger;
import org.apache.asterix.app.nc.NCAppRuntimeContext;
-import org.apache.asterix.app.replication.message.StartupTaskRequestMessage;
+import org.apache.asterix.app.replication.message.RegistrationTasksRequestMessage;
import org.apache.asterix.common.api.AsterixThreadFactory;
import org.apache.asterix.common.api.INcApplicationContext;
import org.apache.asterix.common.config.AsterixExtension;
@@ -48,6 +48,7 @@
import org.apache.asterix.transaction.management.resource.PersistentLocalResourceRepository;
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.application.IServiceContext;
+import org.apache.hyracks.api.client.NodeStatus;
import org.apache.hyracks.api.config.IConfigManager;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.io.IFileDeviceResolver;
@@ -67,7 +68,6 @@
private String nodeId;
private boolean stopInitiated;
private boolean startupCompleted;
- private SystemState systemState;
protected WebManager webManager;
@Override
@@ -117,9 +117,8 @@
this.ncServiceCtx.setMessagingChannelInterfaceFactory(interfaceFactory);
IRecoveryManager recoveryMgr = runtimeContext.getTransactionSubsystem().getRecoveryManager();
- systemState = recoveryMgr.getSystemState();
-
- if (systemState == SystemState.PERMANENT_DATA_LOSS) {
+ final SystemState stateOnStartup = recoveryMgr.getSystemState();
+ if (stateOnStartup == SystemState.PERMANENT_DATA_LOSS) {
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("System state: " + SystemState.PERMANENT_DATA_LOSS);
LOGGER.info("Node ID: " + nodeId);
@@ -187,20 +186,27 @@
// Since we don't pass initial run flag in AsterixHyracksIntegrationUtil, we use the virtualNC flag
final NodeProperties nodeProperties = runtimeContext.getNodeProperties();
- if (systemState == SystemState.PERMANENT_DATA_LOSS
- && (nodeProperties.isInitialRun() || nodeProperties.isVirtualNc())) {
- systemState = SystemState.BOOTSTRAPPING;
+ IRecoveryManager recoveryMgr = runtimeContext.getTransactionSubsystem().getRecoveryManager();
+ SystemState state = recoveryMgr.getSystemState();
+ if (state == SystemState.PERMANENT_DATA_LOSS && (nodeProperties.isInitialRun() || nodeProperties
+ .isVirtualNc())) {
+ state = SystemState.BOOTSTRAPPING;
}
- // Request startup tasks from CC
- StartupTaskRequestMessage.send((NodeControllerService) ncServiceCtx.getControllerService(), systemState);
+ // Request registration tasks from CC
+ RegistrationTasksRequestMessage.send((NodeControllerService) ncServiceCtx.getControllerService(),
+ NodeStatus.BOOTING, state);
startupCompleted = true;
}
@Override
public void onRegisterNode() throws Exception {
if (startupCompleted) {
- // Request startup tasks from CC
- StartupTaskRequestMessage.send((NodeControllerService) ncServiceCtx.getControllerService(), systemState);
+ /*
+ * If the node completed its startup before, then this is a re-registration with
+ * the CC and therefore the system state should be HEALTHY and the node status is ACTIVE
+ */
+ RegistrationTasksRequestMessage.send((NodeControllerService) ncServiceCtx.getControllerService(),
+ NodeStatus.ACTIVE, SystemState.HEALTHY);
}
}
@@ -220,19 +226,6 @@
//Delete working area files from failed jobs
runtimeContext.getIoManager().deleteWorkspaceFiles();
- //Reclaim storage for temporary datasets.
- String storageDirName = ClusterProperties.INSTANCE.getStorageDirectoryName();
- String[] ioDevices = ((PersistentLocalResourceRepository) runtimeContext.getLocalResourceRepository())
- .getStorageMountingPoints();
- for (String ioDevice : ioDevices) {
- String tempDatasetsDir =
- ioDevice + storageDirName + File.separator + StoragePathUtil.TEMP_DATASETS_STORAGE_FOLDER;
- File tmpDsDir = new File(tempDatasetsDir);
- if (tmpDsDir.exists()) {
- IoUtil.delete(tmpDsDir);
- }
- }
-
//TODO
//Reclaim storage for orphaned index artifacts in NCs.
//Note: currently LSM indexes invalid components are deleted when an index is activated.
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java
index 9cce91b..e42b5e5 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FeedOperations.java
@@ -42,7 +42,7 @@
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.common.messaging.api.ICCMessageBroker;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.StoragePathUtil;
import org.apache.asterix.compiler.provider.SqlppCompilationProvider;
import org.apache.asterix.external.api.IAdapterFactory;
@@ -202,7 +202,7 @@
addArgs(feedConnection.getDataverseName(), feedConnection.getFeedId().getEntityName(),
feedConnection.getFeedId().getEntityName(), FeedRuntimeType.INTAKE.toString(),
feedConnection.getDatasetName(), feedConnection.getOutputType());
- CallExpr datasrouceCallFunction = new CallExpr(FeedConstants.FEED_COLLECT_FUN_SIGNATURE, exprList);
+ CallExpr datasrouceCallFunction = new CallExpr(new FunctionSignature(FeedConstants.FEED_COLLECT_FUN), exprList);
FromTerm fromterm = new FromTerm(datasrouceCallFunction, fromTermLeftExpr, null, null);
FromClause fromClause = new FromClause(Arrays.asList(fromterm));
// TODO: This can be the place to add select predicate for ingestion
@@ -279,7 +279,7 @@
Map<ConnectorDescriptorId, ConnectorDescriptorId> connectorIdMapping = new HashMap<>();
Map<OperatorDescriptorId, List<LocationConstraint>> operatorLocations = new HashMap<>();
Map<OperatorDescriptorId, Integer> operatorCounts = new HashMap<>();
- List<JobId> jobIds = new ArrayList<>();
+ List<TxnId> txnIds = new ArrayList<>();
FeedMetaOperatorDescriptor metaOp;
for (int iter1 = 0; iter1 < jobsList.size(); iter1++) {
@@ -415,11 +415,11 @@
for (OperatorDescriptorId root : subJob.getRoots()) {
jobSpec.addRoot(jobSpec.getOperatorMap().get(operatorIdMapping.get(root)));
}
- jobIds.add(((JobEventListenerFactory) subJob.getJobletEventListenerFactory()).getJobId());
+ txnIds.add(((JobEventListenerFactory) subJob.getJobletEventListenerFactory()).getTxnId());
}
// jobEventListenerFactory
- jobSpec.setJobletEventListenerFactory(new MultiTransactionJobletEventListenerFactory(jobIds, true));
+ jobSpec.setJobletEventListenerFactory(new MultiTransactionJobletEventListenerFactory(txnIds, true));
// useConnectorSchedulingPolicy
jobSpec.setUseConnectorPolicyForScheduling(jobsList.get(0).isUseConnectorPolicyForScheduling());
// connectorAssignmentPolicy
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java
index 958444c..4137fbd 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/FlushDatasetUtil.java
@@ -20,12 +20,13 @@
package org.apache.asterix.utils;
import org.apache.asterix.common.config.CompilerProperties;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.JobUtils;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
import org.apache.asterix.runtime.operators.std.FlushDatasetOperatorDescriptor;
-import org.apache.asterix.transaction.management.service.transaction.JobIdFactory;
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraintHelper;
import org.apache.hyracks.algebricks.common.utils.Pair;
@@ -59,8 +60,8 @@
AlgebricksMetaOperatorDescriptor emptySource = new AlgebricksMetaOperatorDescriptor(spec, 0, 1,
new IPushRuntimeFactory[] { new EmptyTupleSourceRuntimeFactory() }, rDescs);
- org.apache.asterix.common.transactions.JobId jobId = JobIdFactory.generateJobId();
- FlushDatasetOperatorDescriptor flushOperator = new FlushDatasetOperatorDescriptor(spec, jobId,
+ TxnId txnId = TxnIdFactory.create();
+ FlushDatasetOperatorDescriptor flushOperator = new FlushDatasetOperatorDescriptor(spec, txnId,
dataset.getDatasetId());
spec.connect(new OneToOneConnectorDescriptor(spec), emptySource, 0, flushOperator, 0);
@@ -72,7 +73,7 @@
AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, emptySource,
primaryPartitionConstraint);
- JobEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(jobId, true);
+ JobEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(txnId, true);
spec.setJobletEventListenerFactory(jobEventListenerFactory);
JobUtils.runJob(hcc, spec, true);
}
diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
index 9e34d70..42f577f 100644
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/utils/RebalanceUtil.java
@@ -34,7 +34,7 @@
import org.apache.asterix.app.active.ActiveNotificationHandler;
import org.apache.asterix.common.api.IMetadataLockManager;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.JobUtils;
import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory;
import org.apache.asterix.metadata.MetadataManager;
@@ -47,7 +47,7 @@
import org.apache.asterix.metadata.utils.IndexUtil;
import org.apache.asterix.rebalance.IDatasetRebalanceCallback;
import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
-import org.apache.asterix.transaction.management.service.transaction.JobIdFactory;
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraintHelper;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -275,21 +275,21 @@
private static void populateDataToRebalanceTarget(Dataset source, Dataset target, MetadataProvider metadataProvider,
IHyracksClientConnection hcc) throws Exception {
JobSpecification spec = new JobSpecification();
- JobId jobId = JobIdFactory.generateJobId();
- JobEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(jobId, true);
+ TxnId txnId = TxnIdFactory.create();
+ JobEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(txnId, true);
spec.setJobletEventListenerFactory(jobEventListenerFactory);
// The pipeline starter.
IOperatorDescriptor starter = DatasetUtil.createDummyKeyProviderOp(spec, source, metadataProvider);
// Creates primary index scan op.
- IOperatorDescriptor primaryScanOp = DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, source, jobId);
+ IOperatorDescriptor primaryScanOp = DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, source, txnId);
// Creates secondary BTree upsert op.
IOperatorDescriptor upsertOp = createPrimaryIndexUpsertOp(spec, metadataProvider, source, target);
// The final commit operator.
- IOperatorDescriptor commitOp = createUpsertCommitOp(spec, metadataProvider, jobId, target);
+ IOperatorDescriptor commitOp = createUpsertCommitOp(spec, metadataProvider, txnId, target);
// Connects empty-tuple-source and scan.
spec.connect(new OneToOneConnectorDescriptor(spec), starter, 0, primaryScanOp, 0);
@@ -326,11 +326,11 @@
// Creates the commit operator for populating the target dataset.
private static IOperatorDescriptor createUpsertCommitOp(JobSpecification spec, MetadataProvider metadataProvider,
- JobId jobId, Dataset target) throws AlgebricksException {
+ TxnId txnId, Dataset target) throws AlgebricksException {
int[] primaryKeyFields = getPrimaryKeyPermutationForUpsert(target);
return new AlgebricksMetaOperatorDescriptor(spec, 1, 0,
new IPushRuntimeFactory[] {
- target.getCommitRuntimeFactory(metadataProvider, jobId, primaryKeyFields, true) },
+ target.getCommitRuntimeFactory(metadataProvider, txnId, primaryKeyFields, true) },
new RecordDescriptor[] { target.getPrimaryRecordDescriptor(metadataProvider) });
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java
index cd58d8f..33f3a42 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/api/http/servlet/ConnectorApiServletTest.java
@@ -113,9 +113,7 @@
ObjectMapper om = new ObjectMapper();
ObjectNode actualResponse = (ObjectNode) om.readTree(outputStream.toString());
- // Checks the temp-or-not, primary key, data type of the dataset.
- boolean temp = actualResponse.get("temp").asBoolean();
- Assert.assertFalse(temp);
+ // Checks the primary key, data type of the dataset.
String primaryKey = actualResponse.get("keys").asText();
Assert.assertEquals("DataverseName,DatasetName", primaryKey);
ARecordType recordType = (ARecordType) JSONDeserializerForTypes.convertFromJSON(actualResponse.get("type"));
@@ -154,12 +152,10 @@
nodeMap.put("asterix_nc2", mockInfo2);
PA.invokeMethod(let,
"formResponseObject(" + ObjectNode.class.getName() + ", " + FileSplit.class.getName() + "[], "
- + ARecordType.class.getName() + ", " + String.class.getName() + ", boolean, "
- + Map.class.getName() + ")",
- actualResponse, splits, recordType, primaryKey, true, nodeMap);
+ + ARecordType.class.getName() + ", " + String.class.getName() + ", " + Map.class.getName() + ")",
+ actualResponse, splits, recordType, primaryKey, nodeMap);
// Constructs expected response.
ObjectNode expectedResponse = om.createObjectNode();
- expectedResponse.put("temp", true);
expectedResponse.put("keys", primaryKey);
expectedResponse.set("type", recordType.toJSON());
ArrayNode splitsArray = om.createArrayNode();
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
index b155b51..72a9b44 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/app/bootstrap/TestNodeController.java
@@ -27,7 +27,7 @@
import java.util.Map;
import java.util.logging.Logger;
-import org.apache.asterix.app.external.TestLibrarian;
+import org.apache.asterix.app.external.ExternalUDFLibrarian;
import org.apache.asterix.app.nc.NCAppRuntimeContext;
import org.apache.asterix.app.nc.TransactionSubsystem;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
@@ -40,6 +40,7 @@
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.transactions.IRecoveryManager.ResourceType;
import org.apache.asterix.common.transactions.ITransactionManager;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory;
import org.apache.asterix.file.StorageComponentProvider;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
@@ -57,6 +58,7 @@
import org.apache.asterix.om.types.IAType;
import org.apache.asterix.runtime.formats.FormatUtils;
import org.apache.asterix.runtime.formats.NonTaggedDataFormat;
+import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
import org.apache.asterix.runtime.operators.LSMPrimaryUpsertOperatorNodePushable;
import org.apache.asterix.runtime.utils.CcApplicationContext;
import org.apache.asterix.test.runtime.ExecutionTestUtil;
@@ -74,6 +76,8 @@
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.ActivityId;
import org.apache.hyracks.api.dataflow.OperatorDescriptorId;
+import org.apache.hyracks.api.dataflow.TaskAttemptId;
+import org.apache.hyracks.api.dataflow.TaskId;
import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
@@ -119,11 +123,10 @@
public static final int DEFAULT_HYRACKS_CC_CLIENT_PORT = 1098;
public static final int DEFAULT_HYRACKS_CC_CLUSTER_PORT = 1099;
public static final int KB32 = 32768;
- public static final int PARTITION = 0;
public static final double BLOOM_FILTER_FALSE_POSITIVE_RATE = 0.01;
public static final TransactionSubsystemProvider TXN_SUBSYSTEM_PROVIDER = TransactionSubsystemProvider.INSTANCE;
// Mutables
- private long jobCounter = 0L;
+ private long jobCounter = 100L;
private final String testConfigFileName;
private final boolean runHDFS;
@@ -137,7 +140,7 @@
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
// remove library directory
- TestLibrarian.removeLibraryDir();
+ ExternalUDFLibrarian.removeLibraryDir();
ExecutionTestUtil.setUp(cleanupOnStart,
testConfigFileName == null ? TEST_CONFIG_FILE_NAME : testConfigFileName,
ExecutionTestUtil.integrationUtil, runHDFS);
@@ -148,12 +151,16 @@
}
public void deInit() throws Exception {
- TestLibrarian.removeLibraryDir();
+ ExternalUDFLibrarian.removeLibraryDir();
ExecutionTestUtil.tearDown(cleanupOnStop);
}
- public org.apache.asterix.common.transactions.JobId getTxnJobId(IHyracksTaskContext ctx) {
- return new org.apache.asterix.common.transactions.JobId((int) ctx.getJobletContext().getJobId().getId());
+ public TxnId getTxnJobId(IHyracksTaskContext ctx) {
+ return getTxnJobId(ctx.getJobletContext().getJobId());
+ }
+
+ public TxnId getTxnJobId(JobId jobId) {
+ return new TxnId(jobId.getId());
}
public Pair<LSMInsertDeleteOperatorNodePushable, CommitRuntime> getInsertPipeline(IHyracksTaskContext ctx,
@@ -175,12 +182,14 @@
IRecordDescriptorProvider recordDescProvider = primaryIndexInfo.getInsertRecordDescriptorProvider();
IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(
storageComponentProvider.getStorageManager(), primaryIndexInfo.getFileSplitProvider());
- LSMInsertDeleteOperatorNodePushable insertOp = new LSMInsertDeleteOperatorNodePushable(ctx, PARTITION,
- primaryIndexInfo.primaryIndexInsertFieldsPermutations,
- recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0), op,
- true, indexHelperFactory, modOpCallbackFactory, null);
- CommitRuntime commitOp = new CommitRuntime(ctx, getTxnJobId(ctx), dataset.getDatasetId(),
- primaryIndexInfo.primaryKeyIndexes, false, true, PARTITION, true);
+ LSMInsertDeleteOperatorNodePushable insertOp =
+ new LSMInsertDeleteOperatorNodePushable(ctx, ctx.getTaskAttemptId().getTaskId().getPartition(),
+ primaryIndexInfo.primaryIndexInsertFieldsPermutations,
+ recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0),
+ op, true, indexHelperFactory, modOpCallbackFactory, null);
+ CommitRuntime commitOp =
+ new CommitRuntime(ctx, getTxnJobId(ctx), dataset.getDatasetId(), primaryIndexInfo.primaryKeyIndexes,
+ true, ctx.getTaskAttemptId().getTaskId().getPartition(), true);
insertOp.setOutputFrameWriter(0, commitOp, primaryIndexInfo.rDesc);
commitOp.setInputRecordDescriptor(0, primaryIndexInfo.rDesc);
return Pair.of(insertOp, commitOp);
@@ -201,7 +210,8 @@
null, null, true, true, indexDataflowHelperFactory, false, false, null,
NoOpOperationCallbackFactory.INSTANCE, filterFields, filterFields, false);
BTreeSearchOperatorNodePushable searchOp =
- searchOpDesc.createPushRuntime(ctx, primaryIndexInfo.getSearchRecordDescriptorProvider(), PARTITION, 1);
+ searchOpDesc.createPushRuntime(ctx, primaryIndexInfo.getSearchRecordDescriptorProvider(),
+ ctx.getTaskAttemptId().getTaskId().getPartition(), 1);
emptyTupleOp.setOutputFrameWriter(0, searchOp,
primaryIndexInfo.getSearchRecordDescriptorProvider().getInputRecordDescriptor(null, 0));
searchOp.setOutputFrameWriter(0, countOp, primaryIndexInfo.rDesc);
@@ -234,7 +244,7 @@
public PrimaryIndexInfo createPrimaryIndex(Dataset dataset, IAType[] primaryKeyTypes, ARecordType recordType,
ARecordType metaType, int[] filterFields, IStorageComponentProvider storageComponentProvider,
- int[] primaryKeyIndexes, List<Integer> primaryKeyIndicators)
+ int[] primaryKeyIndexes, List<Integer> primaryKeyIndicators, int partition)
throws AlgebricksException, HyracksDataException, RemoteException, ACIDException {
MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
org.apache.hyracks.algebricks.common.utils.Pair<ILSMMergePolicyFactory, Map<String, String>> mergePolicy =
@@ -251,9 +261,9 @@
recordType, metaType, mergePolicy.first, mergePolicy.second);
IndexBuilderFactory indexBuilderFactory =
new IndexBuilderFactory(storageComponentProvider.getStorageManager(),
- primaryIndexInfo.getFileSplitProvider(), resourceFactory, !dataset.isTemp());
- IHyracksTaskContext ctx = createTestContext(false);
- IIndexBuilder indexBuilder = indexBuilderFactory.create(ctx, 0);
+ primaryIndexInfo.getFileSplitProvider(), resourceFactory, true);
+ IHyracksTaskContext ctx = createTestContext(newJobId(), partition, false);
+ IIndexBuilder indexBuilder = indexBuilderFactory.create(ctx, partition);
indexBuilder.build();
} finally {
mdProvider.getLocks().unlock();
@@ -290,18 +300,23 @@
return primaryIndexTypeTraits;
}
- public IHyracksTaskContext createTestContext(boolean withMessaging) throws HyracksDataException {
+ public IHyracksTaskContext createTestContext(JobId jobId, int partition, boolean withMessaging)
+ throws HyracksDataException {
IHyracksTaskContext ctx = TestUtils.create(KB32);
if (withMessaging) {
TaskUtil.put(HyracksConstants.KEY_MESSAGE, new VSizeFrame(ctx), ctx);
}
- JobId jobId = newJobId();
IHyracksJobletContext jobletCtx = Mockito.mock(IHyracksJobletContext.class);
+ JobEventListenerFactory factory = new JobEventListenerFactory(new TxnId(jobId.getId()), true);
+ Mockito.when(jobletCtx.getJobletEventListenerFactory()).thenReturn(factory);
Mockito.when(jobletCtx.getServiceContext()).thenReturn(ExecutionTestUtil.integrationUtil.ncs[0].getContext());
Mockito.when(jobletCtx.getJobId()).thenReturn(jobId);
ctx = Mockito.spy(ctx);
Mockito.when(ctx.getJobletContext()).thenReturn(jobletCtx);
Mockito.when(ctx.getIoManager()).thenReturn(ExecutionTestUtil.integrationUtil.ncs[0].getIoManager());
+ TaskAttemptId taskId =
+ new TaskAttemptId(new TaskId(new ActivityId(new OperatorDescriptorId(0), 0), partition), 0);
+ Mockito.when(ctx.getTaskAttemptId()).thenReturn(taskId);
return ctx;
}
@@ -373,7 +388,7 @@
(CcApplicationContext) ExecutionTestUtil.integrationUtil.cc.getApplicationContext();
FileSplit[] splits = SplitsAndConstraintsUtil.getIndexSplits(appCtx.getClusterStateManager(), dataset,
index.getIndexName(), nodes);
- fileSplitProvider = new ConstantFileSplitProvider(Arrays.copyOfRange(splits, 0, 1));
+ fileSplitProvider = new ConstantFileSplitProvider(splits);
}
public Index getIndex() {
@@ -444,12 +459,13 @@
IRecordDescriptorProvider recordDescProvider = primaryIndexInfo.getInsertRecordDescriptorProvider();
IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(
storageComponentProvider.getStorageManager(), primaryIndexInfo.getFileSplitProvider());
- LSMPrimaryUpsertOperatorNodePushable insertOp = new LSMPrimaryUpsertOperatorNodePushable(ctx, PARTITION,
- indexHelperFactory, primaryIndexInfo.primaryIndexInsertFieldsPermutations,
- recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0),
- modificationCallbackFactory, searchCallbackFactory, keyIndexes.length, recordType, -1,
- frameOpCallbackFactory == null ? dataset.getFrameOpCallbackFactory() : frameOpCallbackFactory,
- MissingWriterFactory.INSTANCE, hasSecondaries);
+ LSMPrimaryUpsertOperatorNodePushable insertOp =
+ new LSMPrimaryUpsertOperatorNodePushable(ctx, ctx.getTaskAttemptId().getTaskId().getPartition(),
+ indexHelperFactory, primaryIndexInfo.primaryIndexInsertFieldsPermutations,
+ recordDescProvider.getInputRecordDescriptor(new ActivityId(new OperatorDescriptorId(0), 0), 0),
+ modificationCallbackFactory, searchCallbackFactory, keyIndexes.length, recordType, -1,
+ frameOpCallbackFactory == null ? dataset.getFrameOpCallbackFactory() : frameOpCallbackFactory,
+ MissingWriterFactory.INSTANCE, hasSecondaries);
RecordDescriptor upsertOutRecDesc = getUpsertOutRecDesc(primaryIndexInfo.rDesc, dataset,
filterFields == null ? 0 : filterFields.length, recordType, metaType);
// fix pk fields
@@ -459,7 +475,7 @@
pkFieldsInCommitOp[i] = diff + i;
}
CommitRuntime commitOp = new CommitRuntime(ctx, getTxnJobId(ctx), dataset.getDatasetId(), pkFieldsInCommitOp,
- false, true, PARTITION, true);
+ true, ctx.getTaskAttemptId().getTaskId().getPartition(), true);
insertOp.setOutputFrameWriter(0, commitOp, upsertOutRecDesc);
commitOp.setInputRecordDescriptor(0, upsertOutRecDesc);
return Pair.of(insertOp, commitOp);
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java
index 6c11139..1466088 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/runtime/ClusterStateManagerTest.java
@@ -35,6 +35,7 @@
import org.apache.asterix.runtime.transaction.ResourceIdManager;
import org.apache.asterix.runtime.utils.CcApplicationContext;
import org.apache.asterix.runtime.utils.ClusterStateManager;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.application.ICCServiceContext;
import org.apache.hyracks.api.config.IApplicationConfig;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -185,7 +186,7 @@
}
private void notifyNodeJoined(ClusterStateManager csm, String nodeId, int partitionId, boolean registerPartitions)
- throws HyracksException, AsterixException {
+ throws HyracksException, AlgebricksException {
csm.notifyNodeJoin(nodeId, Collections.emptyMap());
if (registerPartitions) {
csm.registerNodePartitions(nodeId, new ClusterPartition[] { new ClusterPartition(partitionId, nodeId, 0) });
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java
index 5199b1c..1cedc96 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/active/TestEventsListener.java
@@ -30,13 +30,13 @@
import org.apache.asterix.app.active.ActiveEntityEventsListener;
import org.apache.asterix.common.api.IMetadataLockManager;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.metadata.LockList;
import org.apache.asterix.external.feed.watch.WaitForStateSubscriber;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.translator.IStatementExecutor;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.job.JobId;
@@ -110,7 +110,7 @@
try {
metadataProvider.getApplicationContext().getMetadataLockManager()
.acquireDatasetReadLock(metadataProvider.getLocks(), "Default.type");
- } catch (AsterixException e) {
+ } catch (AlgebricksException e) {
throw HyracksDataException.create(e);
}
failCompile(onStart);
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 4ca9131..0d66256 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
@@ -58,6 +58,7 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
+import org.apache.asterix.app.external.IExternalUDFLibrarian;
import org.apache.asterix.common.api.Duration;
import org.apache.asterix.common.config.GlobalConfig;
import org.apache.asterix.common.utils.Servlets;
@@ -134,7 +135,7 @@
*/
protected final List<InetSocketAddress> endpoints;
protected int endpointSelector;
- protected ITestLibrarian librarian;
+ protected IExternalUDFLibrarian librarian;
private Map<File, TestLoop> testLoops = new HashMap<>();
public TestExecutor() {
@@ -153,7 +154,7 @@
this.endpoints = endpoints;
}
- public void setLibrarian(ITestLibrarian librarian) {
+ public void setLibrarian(IExternalUDFLibrarian librarian) {
this.librarian = librarian;
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java
index 36cb4bb..70436b5 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/ComponentRollbackTest.java
@@ -39,8 +39,9 @@
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.dataflow.LSMInsertDeleteOperatorNodePushable;
import org.apache.asterix.common.ioopcallbacks.AbstractLSMIOOperationCallback;
-import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.ITransactionManager;
+import org.apache.asterix.common.transactions.TransactionOptions;
import org.apache.asterix.external.util.DataflowUtils;
import org.apache.asterix.file.StorageComponentProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -57,6 +58,7 @@
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.test.CountAnswer;
import org.apache.hyracks.api.test.FrameWriterTestUtils;
import org.apache.hyracks.api.test.FrameWriterTestUtils.FrameWriterOperation;
@@ -64,7 +66,7 @@
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.btree.impl.TestLsmBtree;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
@@ -132,21 +134,23 @@
public void createIndex() throws Exception {
List<List<String>> partitioningKeys = new ArrayList<>();
partitioningKeys.add(Collections.singletonList("key"));
+ int partition = 0;
dataset = new TestDataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH,
- partitioningKeys, null, null, null, false, null, false),
+ partitioningKeys, null, null, null, false, null),
null, DatasetType.INTERNAL, DATASET_ID, 0);
PrimaryIndexInfo primaryIndexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null,
- storageManager, KEY_INDEXES, KEY_INDICATORS_LIST);
+ storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, partition);
IndexDataflowHelperFactory iHelperFactory =
new IndexDataflowHelperFactory(nc.getStorageManager(), primaryIndexInfo.getFileSplitProvider());
- ctx = nc.createTestContext(false);
- indexDataflowHelper = iHelperFactory.create(ctx.getJobletContext().getServiceContext(), 0);
+ JobId jobId = nc.newJobId();
+ ctx = nc.createTestContext(jobId, partition, false);
+ indexDataflowHelper = iHelperFactory.create(ctx.getJobletContext().getServiceContext(), partition);
indexDataflowHelper.open();
lsmBtree = (TestLsmBtree) indexDataflowHelper.getIndexInstance();
indexDataflowHelper.close();
- nc.newJobId();
- txnCtx = nc.getTransactionManager().getTransactionContext(nc.getTxnJobId(ctx), true);
+ txnCtx = nc.getTransactionManager().beginTransaction(nc.getTxnJobId(ctx),
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL));
insertOp = nc.getInsertPipeline(ctx, dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, KEY_INDEXES,
KEY_INDICATORS_LIST, storageManager).getLeft();
}
@@ -156,7 +160,7 @@
indexDataflowHelper.destroy();
}
- private void allowAllOps(TestLsmBtree lsmBtree) {
+ static void allowAllOps(TestLsmBtree lsmBtree) {
lsmBtree.addModifyCallback(sem -> sem.release());
lsmBtree.addFlushCallback(sem -> sem.release());
lsmBtree.addSearchCallback(sem -> sem.release());
@@ -188,25 +192,24 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
- ILSMIndexAccessor lsmAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ ILSMIndexAccessor lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// rollback a memory component
lsmAccessor.deleteComponents(memoryComponentsPredicate);
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
// rollback the last disk component
- lsmAccessor = lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
long lsn = AbstractLSMIOOperationCallback.getTreeIndexLSN(diskComponents.get(0).getMetadata());
DiskComponentLsnPredicate pred = new DiskComponentLsnPredicate(lsn);
lsmAccessor.deleteComponents(pred);
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS - (2 * RECORDS_PER_COMPONENT));
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS - (2 * RECORDS_PER_COMPONENT));
} catch (Throwable e) {
e.printStackTrace();
Assert.fail(e.getMessage());
@@ -238,23 +241,22 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
-
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
- ILSMIndexAccessor lsmAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ ILSMIndexAccessor lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// rollback a memory component
lsmAccessor.deleteComponents(memoryComponentsPredicate);
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
// insert again
nc.newJobId();
- txnCtx = nc.getTransactionManager().getTransactionContext(nc.getTxnJobId(ctx), true);
+ txnCtx = nc.getTransactionManager().beginTransaction(nc.getTxnJobId(ctx),
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL));
insertOp = nc.getInsertPipeline(ctx, dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, KEY_INDEXES,
KEY_INDICATORS_LIST, storageManager).getLeft();
insertOp.open();
@@ -266,13 +268,14 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// rollback the last disk component
- lsmAccessor = lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
long lsn = AbstractLSMIOOperationCallback.getTreeIndexLSN(diskComponents.get(0).getMetadata());
DiskComponentLsnPredicate pred = new DiskComponentLsnPredicate(lsn);
lsmAccessor.deleteComponents(pred);
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS - (2 * RECORDS_PER_COMPONENT));
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS - (2 * RECORDS_PER_COMPONENT));
} catch (Throwable e) {
e.printStackTrace();
Assert.fail(e.getMessage());
@@ -305,19 +308,18 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- Searcher firstSearcher = new Searcher(nc, ctx, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ Searcher firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
// wait till firstSearcher enter the components
firstSearcher.waitUntilEntered();
// now that we enetered, we will rollback
- ILSMIndexAccessor lsmAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// rollback a memory component
lsmAccessor.deleteComponents(
c -> (c instanceof ILSMMemoryComponent && ((ILSMMemoryComponent) c).isModified()));
@@ -326,15 +328,15 @@
lsmBtree.allowSearch(1);
Assert.assertTrue(firstSearcher.result());
// search now and ensure
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
// rollback the last disk component
// re-block searches
lsmBtree.clearSearchCallbacks();
- Searcher secondSearcher = new Searcher(nc, ctx, dataset, storageManager, lsmBtree,
+ Searcher secondSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree,
TOTAL_NUM_OF_RECORDS - RECORDS_PER_COMPONENT);
// wait till firstSearcher enter the components
secondSearcher.waitUntilEntered();
- lsmAccessor = lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
long lsn = AbstractLSMIOOperationCallback.getTreeIndexLSN(diskComponents.get(0).getMetadata());
DiskComponentLsnPredicate pred = new DiskComponentLsnPredicate(lsn);
lsmAccessor.deleteComponents(pred);
@@ -342,7 +344,7 @@
lsmBtree.addSearchCallback(sem -> sem.release());
lsmBtree.allowSearch(1);
Assert.assertTrue(secondSearcher.result());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS - (2 * RECORDS_PER_COMPONENT));
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS - (2 * RECORDS_PER_COMPONENT));
} catch (Throwable e) {
e.printStackTrace();
Assert.fail(e.getMessage());
@@ -374,13 +376,13 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// disable flushes
lsmBtree.clearFlushCallbacks();
Flusher firstFlusher = new Flusher(lsmBtree);
@@ -389,7 +391,7 @@
// now that we enetered, we will rollback. This will not proceed since it is waiting for the flush to complete
Rollerback rollerback = new Rollerback(lsmBtree, memoryComponentsPredicate);
// now that the rollback has completed, we will search
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
//unblock the flush
lsmBtree.allowFlush(1);
// ensure rollback completed
@@ -397,7 +399,7 @@
// ensure current mem component is not modified
Assert.assertFalse(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
// search now and ensure
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
} catch (Throwable e) {
e.printStackTrace();
Assert.fail(e.getMessage());
@@ -430,17 +432,16 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// Now, we will start a full merge
Merger merger = new Merger(lsmBtree);
- ILSMIndexAccessor mergeAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor mergeAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// select the components to merge... the last three
int numMergedComponents = 3;
List<ILSMDiskComponent> mergedComponents = new ArrayList<>();
@@ -454,7 +455,7 @@
Rollerback rollerback = new Rollerback(lsmBtree, new DiskComponentLsnPredicate(lsn));
// rollback is now waiting for the merge to complete
// we will search
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
//unblock the merge
lsmBtree.allowMerge(1);
// ensure rollback completes
@@ -462,7 +463,7 @@
// ensure current mem component is not modified
Assert.assertFalse(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
// search now and ensure that we rolled back the merged component
- searchAndAssertCount(nc, ctx, dataset, storageManager,
+ searchAndAssertCount(nc, 0, dataset, storageManager,
TOTAL_NUM_OF_RECORDS - ((numMergedComponents + 1/*memory component*/) * RECORDS_PER_COMPONENT));
} catch (Throwable e) {
e.printStackTrace();
@@ -495,13 +496,13 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// disable flushes
// disable searches
lsmBtree.clearFlushCallbacks();
@@ -509,7 +510,7 @@
Flusher firstFlusher = new Flusher(lsmBtree);
dsLifecycleMgr.flushDataset(dataset.getDatasetId(), true);
firstFlusher.waitUntilCount(1);
- Searcher firstSearcher = new Searcher(nc, ctx, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ Searcher firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
// wait till firstSearcher enter the components
firstSearcher.waitUntilEntered();
// now that we enetered, we will rollback rollback a memory component
@@ -523,7 +524,7 @@
rollerback.complete();
Assert.assertFalse(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
// search now and ensure the rollback was no op since it waits for ongoing flushes
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
} catch (Throwable e) {
e.printStackTrace();
Assert.fail(e.getMessage());
@@ -555,13 +556,13 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// disable flushes
// disable searches
lsmBtree.clearFlushCallbacks();
@@ -569,7 +570,7 @@
dsLifecycleMgr.flushDataset(dataset.getDatasetId(), true);
firstFlusher.waitUntilCount(1);
lsmBtree.clearSearchCallbacks();
- Searcher firstSearcher = new Searcher(nc, ctx, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ Searcher firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
// wait till firstSearcher enter the components
firstSearcher.waitUntilEntered();
// now that we enetered, we will rollback
@@ -584,7 +585,7 @@
rollerback.complete();
Assert.assertFalse(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
// search now and ensure
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
} catch (Throwable e) {
e.printStackTrace();
Assert.fail(e.getMessage());
@@ -617,17 +618,16 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// Now, we will start a merge
Merger merger = new Merger(lsmBtree);
- ILSMIndexAccessor mergeAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor mergeAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// select the components to merge... the last three
int numMergedComponents = 3;
List<ILSMDiskComponent> mergedComponents = new ArrayList<>();
@@ -639,7 +639,7 @@
merger.waitUntilCount(1);
// we will block search
lsmBtree.clearSearchCallbacks();
- Searcher firstSearcher = new Searcher(nc, ctx, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ Searcher firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
// wait till firstSearcher enter the components
firstSearcher.waitUntilEntered();
// now that we enetered, we will rollback
@@ -653,7 +653,7 @@
Assert.assertTrue(firstSearcher.result());
rollerback.complete();
// now that the rollback has completed, we will search
- searchAndAssertCount(nc, ctx, dataset, storageManager,
+ searchAndAssertCount(nc, 0, dataset, storageManager,
TOTAL_NUM_OF_RECORDS - ((numMergedComponents + 1/*memory component*/) * RECORDS_PER_COMPONENT));
// ensure current mem component is not modified
Assert.assertFalse(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
@@ -689,17 +689,16 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
// get all components
List<ILSMMemoryComponent> memComponents = lsmBtree.getMemoryComponents();
List<ILSMDiskComponent> diskComponents = lsmBtree.getDiskComponents();
Assert.assertEquals(9, diskComponents.size());
Assert.assertTrue(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
// Now, we will start a merge
Merger merger = new Merger(lsmBtree);
- ILSMIndexAccessor mergeAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor mergeAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// select the components to merge... the last three
List<ILSMDiskComponent> mergedComponents = new ArrayList<>();
long lsn = AbstractLSMIOOperationCallback.getTreeIndexLSN(diskComponents.get(0).getMetadata());
@@ -711,7 +710,7 @@
merger.waitUntilCount(1);
// we will block search
lsmBtree.clearSearchCallbacks();
- Searcher firstSearcher = new Searcher(nc, ctx, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ Searcher firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
// wait till firstSearcher enter the components
firstSearcher.waitUntilEntered();
// now that we enetered, we will rollback
@@ -721,11 +720,11 @@
lsmBtree.allowSearch(1);
Assert.assertTrue(firstSearcher.result());
// even though rollback has been called, it is still waiting for the merge to complete
- searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
//unblock the merge
lsmBtree.allowMerge(1);
rollerBack.complete();
- searchAndAssertCount(nc, ctx, dataset, storageManager,
+ searchAndAssertCount(nc, 0, dataset, storageManager,
TOTAL_NUM_OF_RECORDS - ((numMergedComponents + 1/*memory component*/) * RECORDS_PER_COMPONENT));
// ensure current mem component is not modified
Assert.assertFalse(memComponents.get(lsmBtree.getCurrentMemoryComponentIndex()).isModified());
@@ -736,7 +735,7 @@
}
private class Rollerback {
- private Thread task;
+ private final Thread task;
private Exception failure;
public Rollerback(TestLsmBtree lsmBtree, Predicate<ILSMComponent> predicate) {
@@ -744,8 +743,7 @@
Runnable runnable = new Runnable() {
@Override
public void run() {
- ILSMIndexAccessor lsmAccessor =
- lsmBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor lsmAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
try {
lsmAccessor.deleteComponents(predicate);
} catch (HyracksDataException e) {
@@ -765,13 +763,13 @@
}
}
- private class Searcher {
- private ExecutorService executor = Executors.newSingleThreadExecutor();
+ static class Searcher {
+ private final ExecutorService executor = Executors.newSingleThreadExecutor();
private Future<Boolean> task;
private volatile boolean entered = false;
- public Searcher(TestNodeController nc, IHyracksTaskContext ctx, Dataset dataset,
- StorageComponentProvider storageManager, TestLsmBtree lsmBtree, int numOfRecords) {
+ public Searcher(TestNodeController nc, int partition, Dataset dataset, StorageComponentProvider storageManager,
+ TestLsmBtree lsmBtree, int numOfRecords) {
lsmBtree.addSearchCallback(sem -> {
synchronized (Searcher.this) {
entered = true;
@@ -781,7 +779,7 @@
Callable<Boolean> callable = new Callable<Boolean>() {
@Override
public Boolean call() throws Exception {
- searchAndAssertCount(nc, ctx, dataset, storageManager, numOfRecords);
+ searchAndAssertCount(nc, partition, dataset, storageManager, numOfRecords);
return true;
}
};
@@ -837,7 +835,7 @@
}
}
- private class DiskComponentLsnPredicate implements Predicate<ILSMComponent> {
+ private static class DiskComponentLsnPredicate implements Predicate<ILSMComponent> {
private final long lsn;
public DiskComponentLsnPredicate(long lsn) {
@@ -857,10 +855,11 @@
}
}
- private void searchAndAssertCount(TestNodeController nc, IHyracksTaskContext ctx, Dataset dataset,
+ static void searchAndAssertCount(TestNodeController nc, int partition, Dataset dataset,
StorageComponentProvider storageManager, int numOfRecords)
throws HyracksDataException, AlgebricksException {
- nc.newJobId();
+ JobId jobId = nc.newJobId();
+ IHyracksTaskContext ctx = nc.createTestContext(jobId, partition, false);
TestTupleCounterFrameWriter countOp = create(nc.getSearchOutputDesc(KEY_TYPES, RECORD_TYPE, META_TYPE),
Collections.emptyList(), Collections.emptyList(), false);
IPushRuntime emptyTupleOp = nc.getFullScanPipeline(countOp, ctx, dataset, KEY_TYPES, RECORD_TYPE, META_TYPE,
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java
index 82eb16a..963cded 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/LogMarkerTest.java
@@ -31,9 +31,10 @@
import org.apache.asterix.app.data.gen.TupleGenerator.GenerationFunction;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.dataflow.LSMInsertDeleteOperatorNodePushable;
-import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ILogRecord;
import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.ITransactionManager;
+import org.apache.asterix.common.transactions.TransactionOptions;
import org.apache.asterix.external.util.DataflowUtils;
import org.apache.asterix.file.StorageComponentProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -49,6 +50,7 @@
import org.apache.hyracks.api.comm.VSizeFrame;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
+import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.test.CountAnswer;
import org.apache.hyracks.api.test.FrameWriterTestUtils;
import org.apache.hyracks.api.test.FrameWriterTestUtils.FrameWriterOperation;
@@ -112,15 +114,15 @@
partitioningKeys.add(Collections.singletonList("key"));
Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH,
- partitioningKeys, null, null, null, false, null, false),
+ partitioningKeys, null, null, null, false, null),
null, DatasetType.INTERNAL, DATASET_ID, 0);
try {
PrimaryIndexInfo indexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null,
- storageManager, KEY_INDEXES, KEY_INDICATORS_LIST);
- IHyracksTaskContext ctx = nc.createTestContext(true);
- nc.newJobId();
- ITransactionContext txnCtx =
- nc.getTransactionManager().getTransactionContext(nc.getTxnJobId(ctx), true);
+ storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, 0);
+ JobId jobId = nc.newJobId();
+ IHyracksTaskContext ctx = nc.createTestContext(jobId, 0, true);
+ ITransactionContext txnCtx = nc.getTransactionManager().beginTransaction(nc.getTxnJobId(ctx),
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL));
LSMInsertDeleteOperatorNodePushable insertOp = nc.getInsertPipeline(ctx, dataset, KEY_TYPES,
RECORD_TYPE, META_TYPE, null, KEY_INDEXES, KEY_INDICATORS_LIST, storageManager).getLeft();
insertOp.open();
@@ -147,7 +149,7 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
IndexDataflowHelperFactory iHelperFactory =
new IndexDataflowHelperFactory(nc.getStorageManager(), indexInfo.getFileSplitProvider());
IIndexDataflowHelper dataflowHelper =
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java
new file mode 100644
index 0000000..2c8141ce
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/MultiPartitionLSMIndexTest.java
@@ -0,0 +1,196 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.test.dataflow;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.asterix.app.bootstrap.TestNodeController;
+import org.apache.asterix.app.bootstrap.TestNodeController.PrimaryIndexInfo;
+import org.apache.asterix.app.data.gen.TupleGenerator;
+import org.apache.asterix.app.data.gen.TupleGenerator.GenerationFunction;
+import org.apache.asterix.app.nc.NCAppRuntimeContext;
+import org.apache.asterix.common.api.IDatasetLifecycleManager;
+import org.apache.asterix.common.config.DatasetConfig.DatasetType;
+import org.apache.asterix.common.dataflow.LSMInsertDeleteOperatorNodePushable;
+import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.ITransactionManager;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.external.util.DataflowUtils;
+import org.apache.asterix.file.StorageComponentProvider;
+import org.apache.asterix.metadata.entities.Dataset;
+import org.apache.asterix.metadata.entities.Index;
+import org.apache.asterix.metadata.entities.InternalDatasetDetails;
+import org.apache.asterix.metadata.entities.InternalDatasetDetails.PartitioningStrategy;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.test.common.TestHelper;
+import org.apache.hyracks.api.comm.VSizeFrame;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAppender;
+import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
+import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
+import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.lsm.btree.impl.TestLsmBtree;
+import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class MultiPartitionLSMIndexTest {
+ private static final IAType[] KEY_TYPES = { BuiltinType.AINT32 };
+ private static final ARecordType RECORD_TYPE = new ARecordType("TestRecordType", new String[] { "key", "value" },
+ new IAType[] { BuiltinType.AINT32, BuiltinType.AINT64 }, false);
+ private static final GenerationFunction[] RECORD_GEN_FUNCTION =
+ { GenerationFunction.DETERMINISTIC, GenerationFunction.DETERMINISTIC };
+ private static final boolean[] UNIQUE_RECORD_FIELDS = { true, false };
+ private static final ARecordType META_TYPE = null;
+ private static final GenerationFunction[] META_GEN_FUNCTION = null;
+ private static final boolean[] UNIQUE_META_FIELDS = null;
+ private static final int[] KEY_INDEXES = { 0 };
+ private static final int[] KEY_INDICATORS = { Index.RECORD_INDICATOR };
+ private static final List<Integer> KEY_INDICATORS_LIST = Arrays.asList(new Integer[] { Index.RECORD_INDICATOR });
+ private static final int TOTAL_NUM_OF_RECORDS = 10000;
+ private static final int RECORDS_PER_COMPONENT = 1000;
+ private static final int DATASET_ID = 101;
+ private static final String DATAVERSE_NAME = "TestDV";
+ private static final String DATASET_NAME = "TestDS";
+ private static final String DATA_TYPE_NAME = "DUMMY";
+ private static final String NODE_GROUP_NAME = "DEFAULT";
+ private static final StorageComponentProvider storageManager = new StorageComponentProvider();
+ private static final int NUM_PARTITIONS = 2;
+ private static TestNodeController nc;
+ private static NCAppRuntimeContext ncAppCtx;
+ private static IDatasetLifecycleManager dsLifecycleMgr;
+ private static Dataset dataset;
+ private static ITransactionContext txnCtx;
+ private static TestLsmBtree[] primarylsmBtrees;
+ private static IHyracksTaskContext[] taskCtxs;
+ private static IIndexDataflowHelper[] indexDataflowHelpers;
+ private static LSMInsertDeleteOperatorNodePushable[] insertOps;
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ System.out.println("SetUp: ");
+ TestHelper.deleteExistingInstanceFiles();
+ nc = new TestNodeController(null, false);
+ nc.init();
+ ncAppCtx = nc.getAppRuntimeContext();
+ dsLifecycleMgr = ncAppCtx.getDatasetLifecycleManager();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ System.out.println("TearDown");
+ nc.deInit();
+ TestHelper.deleteExistingInstanceFiles();
+ }
+
+ @Before
+ public void createIndex() throws Exception {
+ List<List<String>> partitioningKeys = new ArrayList<>();
+ partitioningKeys.add(Collections.singletonList("key"));
+ dataset = new TestDataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
+ NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH,
+ partitioningKeys, null, null, null, false, null),
+ null, DatasetType.INTERNAL, DATASET_ID, 0);
+ taskCtxs = new IHyracksTaskContext[NUM_PARTITIONS];
+ indexDataflowHelpers = new IIndexDataflowHelper[NUM_PARTITIONS];
+ primarylsmBtrees = new TestLsmBtree[NUM_PARTITIONS];
+ insertOps = new LSMInsertDeleteOperatorNodePushable[NUM_PARTITIONS];
+ JobId jobId = nc.newJobId();
+ txnCtx = nc.getTransactionManager().beginTransaction(nc.getTxnJobId(jobId),
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL));
+ for (int i = 0; i < taskCtxs.length; i++) {
+ taskCtxs[i] = nc.createTestContext(jobId, i, false);
+ PrimaryIndexInfo primaryIndexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null,
+ storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, i);
+ IndexDataflowHelperFactory iHelperFactory =
+ new IndexDataflowHelperFactory(nc.getStorageManager(), primaryIndexInfo.getFileSplitProvider());
+ indexDataflowHelpers[i] = iHelperFactory.create(taskCtxs[i].getJobletContext().getServiceContext(), i);
+ indexDataflowHelpers[i].open();
+ primarylsmBtrees[i] = (TestLsmBtree) indexDataflowHelpers[i].getIndexInstance();
+ indexDataflowHelpers[i].close();
+ insertOps[i] = nc.getInsertPipeline(taskCtxs[i], dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null,
+ KEY_INDEXES, KEY_INDICATORS_LIST, storageManager).getLeft();
+ }
+ }
+
+ @After
+ public void destroyIndex() throws Exception {
+ for (IIndexDataflowHelper indexDataflowHelper : indexDataflowHelpers) {
+ indexDataflowHelper.destroy();
+ }
+ }
+
+ @Test
+ public void testFlushOneFullOneEmpty() {
+ try {
+ // allow all operations
+ for (int i = 0; i < NUM_PARTITIONS; i++) {
+ ComponentRollbackTest.allowAllOps(primarylsmBtrees[i]);
+ }
+
+ insertOps[0].open();
+ TupleGenerator tupleGenerator = new TupleGenerator(RECORD_TYPE, META_TYPE, KEY_INDEXES, KEY_INDICATORS,
+ RECORD_GEN_FUNCTION, UNIQUE_RECORD_FIELDS, META_GEN_FUNCTION, UNIQUE_META_FIELDS);
+ VSizeFrame frame = new VSizeFrame(taskCtxs[0]);
+ FrameTupleAppender tupleAppender = new FrameTupleAppender(frame);
+ int numFlushes = 0;
+ for (int j = 0; j < TOTAL_NUM_OF_RECORDS; j++) {
+ // flush every RECORDS_PER_COMPONENT records
+ if (j % RECORDS_PER_COMPONENT == (RECORDS_PER_COMPONENT - 1) && j + 1 != TOTAL_NUM_OF_RECORDS) {
+ if (tupleAppender.getTupleCount() > 0) {
+ tupleAppender.write(insertOps[0], true);
+ }
+ dsLifecycleMgr.flushDataset(dataset.getDatasetId(), false);
+ numFlushes++;
+ }
+ ITupleReference tuple = tupleGenerator.next();
+ DataflowUtils.addTupleToFrame(tupleAppender, tuple, insertOps[0]);
+ }
+ if (tupleAppender.getTupleCount() > 0) {
+ tupleAppender.write(insertOps[0], true);
+ }
+ insertOps[0].close();
+ dsLifecycleMgr.flushDataset(dataset.getDatasetId(), false);
+ numFlushes++;
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
+ // search now and ensure partition 0 has all the records
+ ComponentRollbackTest.searchAndAssertCount(nc, 0, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ // and that partition 1 has no records
+ ComponentRollbackTest.searchAndAssertCount(nc, 1, dataset, storageManager, 0);
+ // and that partition 0 has numFlushes disk components
+ Assert.assertEquals(numFlushes, primarylsmBtrees[0].getDiskComponents().size());
+ // and that partition 1 has no disk components
+ Assert.assertEquals(0, primarylsmBtrees[1].getDiskComponents().size());
+ } catch (Throwable e) {
+ e.printStackTrace();
+ Assert.fail(e.getMessage());
+ }
+ }
+
+}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java
new file mode 100644
index 0000000..b65ba03
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/SearchCursorComponentSwitchTest.java
@@ -0,0 +1,266 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.test.dataflow;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+import org.apache.asterix.app.bootstrap.TestNodeController;
+import org.apache.asterix.app.bootstrap.TestNodeController.PrimaryIndexInfo;
+import org.apache.asterix.app.data.gen.TestTupleCounterFrameWriter;
+import org.apache.asterix.app.data.gen.TupleGenerator;
+import org.apache.asterix.app.data.gen.TupleGenerator.GenerationFunction;
+import org.apache.asterix.app.nc.NCAppRuntimeContext;
+import org.apache.asterix.common.api.IDatasetLifecycleManager;
+import org.apache.asterix.common.config.DatasetConfig.DatasetType;
+import org.apache.asterix.common.dataflow.LSMInsertDeleteOperatorNodePushable;
+import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.ITransactionManager;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.external.util.DataflowUtils;
+import org.apache.asterix.file.StorageComponentProvider;
+import org.apache.asterix.metadata.entities.Dataset;
+import org.apache.asterix.metadata.entities.Index;
+import org.apache.asterix.metadata.entities.InternalDatasetDetails;
+import org.apache.asterix.metadata.entities.InternalDatasetDetails.PartitioningStrategy;
+import org.apache.asterix.om.types.ARecordType;
+import org.apache.asterix.om.types.BuiltinType;
+import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.test.common.TestHelper;
+import org.apache.asterix.test.dataflow.ComponentRollbackTest.Searcher;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.runtime.base.IPushRuntime;
+import org.apache.hyracks.api.comm.VSizeFrame;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAppender;
+import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
+import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
+import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
+import org.apache.hyracks.storage.am.lsm.btree.impl.TestLsmBtree;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
+import org.apache.hyracks.storage.am.lsm.common.impls.BlockingIOOperationCallbackWrapper;
+import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+
+public class SearchCursorComponentSwitchTest {
+ private static final IAType[] KEY_TYPES = { BuiltinType.AINT32 };
+ private static final ARecordType RECORD_TYPE = new ARecordType("TestRecordType", new String[] { "key", "value" },
+ new IAType[] { BuiltinType.AINT32, BuiltinType.AINT64 }, false);
+ private static final GenerationFunction[] RECORD_GEN_FUNCTION =
+ { GenerationFunction.DETERMINISTIC, GenerationFunction.DETERMINISTIC };
+ private static final boolean[] UNIQUE_RECORD_FIELDS = { true, false };
+ private static final ARecordType META_TYPE = null;
+ private static final GenerationFunction[] META_GEN_FUNCTION = null;
+ private static final boolean[] UNIQUE_META_FIELDS = null;
+ private static final int[] KEY_INDEXES = { 0 };
+ private static final int[] KEY_INDICATORS = { Index.RECORD_INDICATOR };
+ private static final List<Integer> KEY_INDICATORS_LIST = Arrays.asList(new Integer[] { Index.RECORD_INDICATOR });
+ private static final int TOTAL_NUM_OF_RECORDS = 2000;
+ private static final int RECORDS_PER_COMPONENT = 1000;
+ private static final int DATASET_ID = 101;
+ private static final String DATAVERSE_NAME = "TestDV";
+ private static final String DATASET_NAME = "TestDS";
+ private static final String DATA_TYPE_NAME = "DUMMY";
+ private static final String NODE_GROUP_NAME = "DEFAULT";
+ private static final StorageComponentProvider storageManager = new StorageComponentProvider();
+ private static TestNodeController nc;
+ private static TestLsmBtree lsmBtree;
+ private static NCAppRuntimeContext ncAppCtx;
+ private static IDatasetLifecycleManager dsLifecycleMgr;
+ private static Dataset dataset;
+ private static IHyracksTaskContext ctx;
+ private static IIndexDataflowHelper indexDataflowHelper;
+ private static ITransactionContext txnCtx;
+ private static LSMInsertDeleteOperatorNodePushable insertOp;
+
+ @BeforeClass
+ public static void setUp() throws Exception {
+ System.out.println("SetUp: ");
+ TestHelper.deleteExistingInstanceFiles();
+ nc = new TestNodeController(null, false);
+ nc.init();
+ ncAppCtx = nc.getAppRuntimeContext();
+ dsLifecycleMgr = ncAppCtx.getDatasetLifecycleManager();
+ }
+
+ @AfterClass
+ public static void tearDown() throws Exception {
+ System.out.println("TearDown");
+ nc.deInit();
+ TestHelper.deleteExistingInstanceFiles();
+ }
+
+ @Before
+ public void createIndex() throws Exception {
+ List<List<String>> partitioningKeys = new ArrayList<>();
+ partitioningKeys.add(Collections.singletonList("key"));
+ dataset = new TestDataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
+ NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH,
+ partitioningKeys, null, null, null, false, null),
+ null, DatasetType.INTERNAL, DATASET_ID, 0);
+ PrimaryIndexInfo primaryIndexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null,
+ storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, 0);
+ IndexDataflowHelperFactory iHelperFactory =
+ new IndexDataflowHelperFactory(nc.getStorageManager(), primaryIndexInfo.getFileSplitProvider());
+ JobId jobId = nc.newJobId();
+ ctx = nc.createTestContext(jobId, 0, false);
+ indexDataflowHelper = iHelperFactory.create(ctx.getJobletContext().getServiceContext(), 0);
+ indexDataflowHelper.open();
+ lsmBtree = (TestLsmBtree) indexDataflowHelper.getIndexInstance();
+ indexDataflowHelper.close();
+ txnCtx = nc.getTransactionManager().beginTransaction(nc.getTxnJobId(ctx),
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL));
+ insertOp = nc.getInsertPipeline(ctx, dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, KEY_INDEXES,
+ KEY_INDICATORS_LIST, storageManager).getLeft();
+ }
+
+ @After
+ public void destroyIndex() throws Exception {
+ indexDataflowHelper.destroy();
+ }
+
+ void unblockSearch(TestLsmBtree lsmBtree) {
+ lsmBtree.addSearchCallback(sem -> sem.release());
+ lsmBtree.allowSearch(1);
+ }
+
+ @Test
+ public void testCursorSwitchSucceed() {
+ try {
+ // allow all operations
+ ComponentRollbackTest.allowAllOps(lsmBtree);
+ // except search
+ lsmBtree.clearSearchCallbacks();
+ insertOp.open();
+ TupleGenerator tupleGenerator = new TupleGenerator(RECORD_TYPE, META_TYPE, KEY_INDEXES, KEY_INDICATORS,
+ RECORD_GEN_FUNCTION, UNIQUE_RECORD_FIELDS, META_GEN_FUNCTION, UNIQUE_META_FIELDS);
+ VSizeFrame frame = new VSizeFrame(ctx);
+ FrameTupleAppender tupleAppender = new FrameTupleAppender(frame);
+ Searcher firstSearcher = null;
+ for (int j = 0; j < TOTAL_NUM_OF_RECORDS; j++) {
+ // flush every RECORDS_PER_COMPONENT records
+ if (j % RECORDS_PER_COMPONENT == (RECORDS_PER_COMPONENT - 1) && j + 1 != TOTAL_NUM_OF_RECORDS) {
+ if (tupleAppender.getTupleCount() > 0) {
+ tupleAppender.write(insertOp, true);
+ }
+ dsLifecycleMgr.flushDataset(dataset.getDatasetId(), false);
+ }
+ ITupleReference tuple = tupleGenerator.next();
+ DataflowUtils.addTupleToFrame(tupleAppender, tuple, insertOp);
+ }
+ if (tupleAppender.getTupleCount() > 0) {
+ tupleAppender.write(insertOp, true);
+ }
+ insertOp.close();
+ // start the search
+ firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ // wait till firstSearcher enter the components
+ firstSearcher.waitUntilEntered();
+ dsLifecycleMgr.flushDataset(dataset.getDatasetId(), false);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
+ // unblock the search
+ unblockSearch(lsmBtree);
+ // ensure the search got the correct number
+ Assert.assertTrue(firstSearcher.result());
+ // search now and ensure
+ searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ @Test
+ public void testCursorSwitchFails() {
+ try {
+ // allow all operations
+ ComponentRollbackTest.allowAllOps(lsmBtree);
+ // except search
+ lsmBtree.clearSearchCallbacks();
+ insertOp.open();
+ TupleGenerator tupleGenerator = new TupleGenerator(RECORD_TYPE, META_TYPE, KEY_INDEXES, KEY_INDICATORS,
+ RECORD_GEN_FUNCTION, UNIQUE_RECORD_FIELDS, META_GEN_FUNCTION, UNIQUE_META_FIELDS);
+ VSizeFrame frame = new VSizeFrame(ctx);
+ FrameTupleAppender tupleAppender = new FrameTupleAppender(frame);
+ Searcher firstSearcher = null;
+ for (int j = 0; j < TOTAL_NUM_OF_RECORDS; j++) {
+ // flush every RECORDS_PER_COMPONENT records
+ if (j % RECORDS_PER_COMPONENT == (RECORDS_PER_COMPONENT - 1) && j + 1 != TOTAL_NUM_OF_RECORDS) {
+ if (tupleAppender.getTupleCount() > 0) {
+ tupleAppender.write(insertOp, true);
+ }
+ dsLifecycleMgr.flushDataset(dataset.getDatasetId(), false);
+ }
+ ITupleReference tuple = tupleGenerator.next();
+ DataflowUtils.addTupleToFrame(tupleAppender, tuple, insertOp);
+ }
+ if (tupleAppender.getTupleCount() > 0) {
+ tupleAppender.write(insertOp, true);
+ }
+ insertOp.close();
+ // start the search
+ firstSearcher = new Searcher(nc, 0, dataset, storageManager, lsmBtree, TOTAL_NUM_OF_RECORDS);
+ // wait till firstSearcher enter the components
+ firstSearcher.waitUntilEntered();
+ dsLifecycleMgr.flushDataset(dataset.getDatasetId(), false);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
+ // merge all components
+ ILSMIndexAccessor mergeAccessor = lsmBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
+ List<ILSMDiskComponent> mergedComponents = new ArrayList<>(lsmBtree.getDiskComponents());
+ BlockingIOOperationCallbackWrapper ioCallback =
+ new BlockingIOOperationCallbackWrapper(lsmBtree.getIOOperationCallback());
+ mergeAccessor.scheduleMerge(ioCallback, mergedComponents);
+ ioCallback.waitForIO();
+ // unblock the search
+ unblockSearch(lsmBtree);
+ // ensure the search got the correct number
+ Assert.assertTrue(firstSearcher.result());
+ // search now and ensure
+ searchAndAssertCount(nc, ctx, dataset, storageManager, TOTAL_NUM_OF_RECORDS);
+ } catch (Throwable e) {
+ e.printStackTrace();
+ Assert.fail(e.getMessage());
+ }
+ }
+
+ private void searchAndAssertCount(TestNodeController nc, IHyracksTaskContext ctx, Dataset dataset,
+ StorageComponentProvider storageManager, int numOfRecords)
+ throws HyracksDataException, AlgebricksException {
+ nc.newJobId();
+ TestTupleCounterFrameWriter countOp =
+ ComponentRollbackTest.create(nc.getSearchOutputDesc(KEY_TYPES, RECORD_TYPE, META_TYPE),
+ Collections.emptyList(), Collections.emptyList(), false);
+ IPushRuntime emptyTupleOp = nc.getFullScanPipeline(countOp, ctx, dataset, KEY_TYPES, RECORD_TYPE, META_TYPE,
+ new NoMergePolicyFactory(), null, null, KEY_INDEXES, KEY_INDICATORS_LIST, storageManager);
+ emptyTupleOp.open();
+ emptyTupleOp.close();
+ Assert.assertEquals(numOfRecords, countOp.getCount());
+ }
+}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestDataset.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestDataset.java
index 893b428..0c4983a 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestDataset.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestDataset.java
@@ -62,6 +62,6 @@
@Override
public ILSMIOOperationCallbackFactory getIoOperationCallbackFactory(Index index) throws AlgebricksException {
- return TestLsmBtreeIoOpCallbackFactory.INSTANCE;
+ return new TestLsmBtreeIoOpCallbackFactory(getComponentIdGeneratorFactory());
}
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java
index 4511f42..7268296 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBTreeResourceFactoryProvider.java
@@ -66,7 +66,6 @@
ITypeTraits[] typeTraits = getTypeTraits(mdProvider, dataset, index, recordType, metaType);
IBinaryComparatorFactory[] cmpFactories = getCmpFactories(mdProvider, dataset, index, recordType, metaType);
int[] bloomFilterFields = getBloomFilterFields(dataset, index);
- boolean durable = !dataset.isTemp();
double bloomFilterFalsePositiveRate = mdProvider.getStorageProperties().getBloomFilterFalsePositiveRate();
ILSMOperationTrackerFactory opTrackerFactory = dataset.getIndexOperationTrackerFactory(index);
ILSMIOOperationCallbackFactory ioOpCallbackFactory = dataset.getIoOperationCallbackFactory(index);
@@ -78,7 +77,7 @@
AsterixVirtualBufferCacheProvider vbcProvider = new AsterixVirtualBufferCacheProvider(dataset.getDatasetId());
return new TestLsmBtreeLocalResourceFactory(storageManager, typeTraits, cmpFactories, filterTypeTraits,
filterCmpFactories, filterFields, opTrackerFactory, ioOpCallbackFactory, metadataPageManagerFactory,
- vbcProvider, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties, durable, bloomFilterFields,
+ vbcProvider, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties, true, bloomFilterFields,
bloomFilterFalsePositiveRate, index.isPrimaryIndex(), btreeFields);
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBtreeIoOpCallbackFactory.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBtreeIoOpCallbackFactory.java
index 327c66e..44967e3 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBtreeIoOpCallbackFactory.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/dataflow/TestLsmBtreeIoOpCallbackFactory.java
@@ -19,18 +19,20 @@
package org.apache.asterix.test.dataflow;
import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallback;
+import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallbackFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.EmptyComponent;
-public class TestLsmBtreeIoOpCallbackFactory implements ILSMIOOperationCallbackFactory {
+public class TestLsmBtreeIoOpCallbackFactory extends LSMBTreeIOOperationCallbackFactory {
private static final long serialVersionUID = 1L;
- public static TestLsmBtreeIoOpCallbackFactory INSTANCE = new TestLsmBtreeIoOpCallbackFactory();
private static volatile int completedFlushes = 0;
private static volatile int completedMerges = 0;
private static volatile int rollbackFlushes = 0;
@@ -38,7 +40,8 @@
private static volatile int failedFlushes = 0;
private static volatile int failedMerges = 0;
- private TestLsmBtreeIoOpCallbackFactory() {
+ public TestLsmBtreeIoOpCallbackFactory(ILSMComponentIdGeneratorFactory idGeneratorFactory) {
+ super(idGeneratorFactory);
}
@Override
@@ -50,7 +53,7 @@
// Whenever this is called, it resets the counter
// However, the counters for the failed operations are never reset since we expect them
// To be always 0
- return new TestLsmBtreeIoOpCallback(index);
+ return new TestLsmBtreeIoOpCallback(index, getComponentIdGenerator());
}
public int getTotalFlushes() {
@@ -90,23 +93,24 @@
}
public class TestLsmBtreeIoOpCallback extends LSMBTreeIOOperationCallback {
- public TestLsmBtreeIoOpCallback(ILSMIndex index) {
- super(index);
+ public TestLsmBtreeIoOpCallback(ILSMIndex index, ILSMComponentIdGenerator idGenerator) {
+ super(index, idGenerator);
}
@Override
- public void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent) {
+ public void afterFinalize(LSMIOOperationType opType, ILSMDiskComponent newComponent)
+ throws HyracksDataException {
super.afterFinalize(opType, newComponent);
- synchronized (INSTANCE) {
+ synchronized (TestLsmBtreeIoOpCallbackFactory.this) {
if (newComponent != null) {
if (newComponent == EmptyComponent.INSTANCE) {
- if (opType == LSMOperationType.FLUSH) {
+ if (opType == LSMIOOperationType.FLUSH) {
rollbackFlushes++;
} else {
rollbackMerges++;
}
} else {
- if (opType == LSMOperationType.FLUSH) {
+ if (opType == LSMIOOperationType.FLUSH) {
completedFlushes++;
} else {
completedMerges++;
@@ -115,12 +119,12 @@
} else {
recordFailure(opType);
}
- INSTANCE.notifyAll();
+ TestLsmBtreeIoOpCallbackFactory.this.notifyAll();
}
}
- private void recordFailure(LSMOperationType opType) {
- if (opType == LSMOperationType.FLUSH) {
+ private void recordFailure(LSMIOOperationType opType) {
+ if (opType == LSMIOOperationType.FLUSH) {
failedFlushes++;
} else {
failedMerges++;
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java
index 5384c92..30cfb4f 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/logging/CheckpointingTest.java
@@ -34,11 +34,12 @@
import org.apache.asterix.common.configuration.Property;
import org.apache.asterix.common.dataflow.LSMInsertDeleteOperatorNodePushable;
import org.apache.asterix.common.transactions.Checkpoint;
-import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ICheckpointManager;
import org.apache.asterix.common.transactions.IRecoveryManager;
import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.ITransactionManager;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
+import org.apache.asterix.common.transactions.TransactionOptions;
import org.apache.asterix.external.util.DataflowUtils;
import org.apache.asterix.file.StorageComponentProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -53,6 +54,7 @@
import org.apache.asterix.transaction.management.service.recovery.AbstractCheckpointManager;
import org.apache.hyracks.api.comm.VSizeFrame;
import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAppender;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
@@ -121,15 +123,15 @@
partitioningKeys.add(Collections.singletonList("key"));
Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH,
- partitioningKeys, null, null, null, false, null, false),
+ partitioningKeys, null, null, null, false, null),
null, DatasetType.INTERNAL, DATASET_ID, 0);
try {
nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES,
- KEY_INDICATOR_LIST);
- IHyracksTaskContext ctx = nc.createTestContext(false);
- nc.newJobId();
- ITransactionContext txnCtx =
- nc.getTransactionManager().getTransactionContext(nc.getTxnJobId(ctx), true);
+ KEY_INDICATOR_LIST, 0);
+ JobId jobId = nc.newJobId();
+ IHyracksTaskContext ctx = nc.createTestContext(jobId, 0, false);
+ ITransactionContext txnCtx = nc.getTransactionManager().beginTransaction(nc.getTxnJobId(ctx),
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL));
// Prepare insert operation
LSMInsertDeleteOperatorNodePushable insertOp = nc.getInsertPipeline(ctx, dataset, KEY_TYPES,
RECORD_TYPE, META_TYPE, null, KEY_INDEXES, KEY_INDICATOR_LIST, storageManager).getLeft();
@@ -202,7 +204,7 @@
tupleAppender.write(insertOp, true);
}
insertOp.close();
- nc.getTransactionManager().completedTransaction(txnCtx, DatasetId.NULL, -1, true);
+ nc.getTransactionManager().commitTransaction(txnCtx.getTxnId());
} finally {
nc.deInit();
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java
index 3969ec5..3e906b4 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/metadata/MetadataTxnTest.java
@@ -21,11 +21,20 @@
import java.util.Arrays;
import java.util.List;
import java.util.Set;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import java.util.stream.Collectors;
+import java.util.stream.IntStream;
import java.util.stream.Stream;
import org.apache.asterix.api.common.AsterixHyracksIntegrationUtil;
+import org.apache.asterix.common.api.IDatasetLifecycleManager;
+import org.apache.asterix.common.api.INcApplicationContext;
+import org.apache.asterix.common.config.DatasetConfig;
import org.apache.asterix.common.config.GlobalConfig;
+import org.apache.asterix.common.context.PrimaryIndexOperationTracker;
import org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.metadata.MetadataTransactionContext;
@@ -36,7 +45,9 @@
import org.apache.asterix.metadata.utils.DatasetUtil;
import org.apache.asterix.test.common.TestExecutor;
import org.apache.asterix.testframework.context.TestCaseContext;
+import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
import org.junit.After;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -137,4 +148,88 @@
MetadataManager.INSTANCE.commitTransaction(readMdTxn);
}
}
+
+ @Test
+ public void concurrentMetadataTxn() throws Exception {
+ // get create type and dataset
+ String datasetName = "dataset1";
+ final TestCaseContext.OutputFormat format = TestCaseContext.OutputFormat.CLEAN_JSON;
+ testExecutor.executeSqlppUpdateOrDdl("CREATE TYPE KeyType AS { id: int };", format);
+ testExecutor.executeSqlppUpdateOrDdl("CREATE DATASET " + datasetName + "(KeyType) PRIMARY KEY id;", format);
+
+ // get created dataset
+ ICcApplicationContext appCtx =
+ (ICcApplicationContext) integrationUtil.getClusterControllerService().getApplicationContext();
+ MetadataProvider metadataProvider = new MetadataProvider(appCtx, null);
+ final MetadataTransactionContext mdTxnCtx = MetadataManager.INSTANCE.beginTransaction();
+ metadataProvider.setMetadataTxnContext(mdTxnCtx);
+ Dataset sourceDataset;
+ try {
+ sourceDataset = metadataProvider.findDataset(MetadataBuiltinEntities.DEFAULT_DATAVERSE_NAME, datasetName);
+ MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
+ } finally {
+ metadataProvider.getLocks().unlock();
+ }
+
+ /*
+ * Concurrently insert copies of the created dataset with
+ * different names and either commit or abort the transaction.
+ */
+ final AtomicInteger failCount = new AtomicInteger(0);
+ Thread transactor1 = new Thread(() -> IntStream.range(1, 100).forEach(x -> {
+ try {
+ addDataset(appCtx, sourceDataset, x, x % 2 == 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ failCount.incrementAndGet();
+ }
+ }));
+
+ Thread transactor2 = new Thread(() -> IntStream.range(101, 200).forEach(x -> {
+ try {
+ addDataset(appCtx, sourceDataset, x, x % 3 == 0);
+ } catch (Exception e) {
+ e.printStackTrace();
+ failCount.incrementAndGet();
+ }
+ }));
+
+ transactor1.start();
+ transactor2.start();
+ transactor1.join();
+ transactor2.join();
+
+ Assert.assertEquals(0, failCount.get());
+
+ // make sure all metadata indexes have no pending operations after all txns committed/aborted
+ final IDatasetLifecycleManager datasetLifecycleManager =
+ ((INcApplicationContext) integrationUtil.ncs[0].getApplicationContext()).getDatasetLifecycleManager();
+ int maxMetadatasetId = 14;
+ for (int i = 1; i <= maxMetadatasetId; i++) {
+ if (datasetLifecycleManager.getIndex(i, i) != null) {
+ final PrimaryIndexOperationTracker opTracker = datasetLifecycleManager.getOperationTracker(i);
+ Assert.assertEquals(0, opTracker.getNumActiveOperations());
+ }
+ }
+ }
+
+ private void addDataset(ICcApplicationContext appCtx, Dataset source, int datasetPostfix, boolean abort)
+ throws Exception {
+ Dataset dataset = new Dataset(source.getDataverseName(), "ds_" + datasetPostfix, source.getDataverseName(),
+ source.getDatasetType().name(), source.getNodeGroupName(), NoMergePolicyFactory.NAME, null,
+ source.getDatasetDetails(), source.getHints(), DatasetConfig.DatasetType.INTERNAL, datasetPostfix, 0);
+ MetadataProvider metadataProvider = new MetadataProvider(appCtx, null);
+ final MetadataTransactionContext writeTxn = MetadataManager.INSTANCE.beginTransaction();
+ metadataProvider.setMetadataTxnContext(writeTxn);
+ try {
+ MetadataManager.INSTANCE.addDataset(writeTxn, dataset);
+ if (abort) {
+ MetadataManager.INSTANCE.abortTransaction(writeTxn);
+ } else {
+ MetadataManager.INSTANCE.commitTransaction(writeTxn);
+ }
+ } finally {
+ metadataProvider.getLocks().unlock();
+ }
+ }
}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
index d1c3ce4..c0a4d80 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/optimizer/OptimizerTest.java
@@ -45,6 +45,7 @@
import org.apache.asterix.test.common.TestHelper;
import org.apache.asterix.test.runtime.HDFSCluster;
import org.apache.asterix.translator.IStatementExecutorFactory;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.client.IHyracksClientConnection;
import org.junit.AfterClass;
import org.junit.Assume;
@@ -189,7 +190,7 @@
query, plan, provider, statementExecutorFactory, storageComponentProvider);
try {
asterix.compile(true, false, false, true, true, false, false);
- } catch (AsterixException e) {
+ } catch (AlgebricksException e) {
plan.close();
query.close();
throw new Exception("Compile ERROR for " + queryFile + ": " + e.getMessage(), e);
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
index 03f42f5..78bed6a 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/LangExecutionUtil.java
@@ -31,7 +31,7 @@
import java.util.Collection;
import java.util.List;
-import org.apache.asterix.app.external.TestLibrarian;
+import org.apache.asterix.app.external.ExternalUDFLibrarian;
import org.apache.asterix.common.config.ClusterProperties;
import org.apache.asterix.common.library.ILibraryManager;
import org.apache.asterix.test.common.TestExecutor;
@@ -56,7 +56,7 @@
private static final List<String> badTestCases = new ArrayList<>();
private static TestExecutor testExecutor;
- private static TestLibrarian librarian;
+ private static ExternalUDFLibrarian librarian;
private static final int repeat = Integer.getInteger("test.repeat", 1);
public static void setUp(String configFile, TestExecutor executor) throws Exception {
@@ -64,8 +64,8 @@
File outdir = new File(PATH_ACTUAL);
outdir.mkdirs();
List<ILibraryManager> libraryManagers = ExecutionTestUtil.setUp(cleanupOnStart, configFile);
- TestLibrarian.removeLibraryDir();
- librarian = new TestLibrarian(libraryManagers);
+ ExternalUDFLibrarian.removeLibraryDir();
+ librarian = new ExternalUDFLibrarian(libraryManagers);
testExecutor.setLibrarian(librarian);
if (repeat != 1) {
System.out.println("FYI: each test will be run " + repeat + " times.");
@@ -79,7 +79,7 @@
// Check whether there are leaked threads.
checkThreadLeaks();
} finally {
- TestLibrarian.removeLibraryDir();
+ ExternalUDFLibrarian.removeLibraryDir();
ExecutionTestUtil.tearDown(cleanupOnStop);
ExecutionTestUtil.integrationUtil.removeTestStorageFiles();
if (!badTestCases.isEmpty()) {
@@ -189,7 +189,7 @@
return num;
}
- private static void checkThreadLeaks() throws IOException {
+ public static void checkThreadLeaks() throws IOException {
String threadDump = ThreadDumpUtil.takeDumpJSONString();
// Currently we only do sanity check for threads used in the execution engine.
// Later we should check if there are leaked storage threads as well.
@@ -200,7 +200,7 @@
}
}
- private static void checkOpenRunFileLeaks() throws IOException {
+ public static void checkOpenRunFileLeaks() throws IOException {
if (SystemUtils.IS_OS_WINDOWS) {
return;
}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DeallocatableTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DeallocatableTest.java
new file mode 100644
index 0000000..cfd251b
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DeallocatableTest.java
@@ -0,0 +1,92 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.test.storage;
+
+import java.nio.ByteBuffer;
+import java.util.concurrent.TimeUnit;
+
+import org.apache.asterix.app.bootstrap.TestNodeController;
+import org.apache.asterix.replication.management.NetworkingUtil;
+import org.apache.asterix.test.common.TestHelper;
+import org.apache.asterix.test.runtime.LangExecutionUtil;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.dataflow.ConnectorDescriptorId;
+import org.apache.hyracks.api.dataflow.TaskAttemptId;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.partitions.PartitionId;
+import org.apache.hyracks.comm.channels.NetworkOutputChannel;
+import org.apache.hyracks.control.nc.NodeControllerService;
+import org.apache.hyracks.control.nc.partitions.MaterializingPipelinedPartition;
+import org.apache.hyracks.net.protocols.muxdemux.ChannelControlBlock;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class DeallocatableTest {
+
+ @Before
+ public void setUp() throws Exception {
+ TestHelper.deleteExistingInstanceFiles();
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ TestHelper.deleteExistingInstanceFiles();
+ }
+
+ @Test
+ public void deallocateBeforeConsumerStart() throws Exception {
+ TestNodeController nc = new TestNodeController(null, false);
+ try {
+ nc.init();
+ final NodeControllerService ncs =
+ (NodeControllerService) nc.getAppRuntimeContext().getServiceContext().getControllerService();
+ final TaskAttemptId taId = Mockito.mock(TaskAttemptId.class);
+ JobId jobId = nc.newJobId();
+ final IHyracksTaskContext ctx = nc.createTestContext(jobId, 0, true);
+ final ConnectorDescriptorId codId = new ConnectorDescriptorId(1);
+ final PartitionId pid = new PartitionId(ctx.getJobletContext().getJobId(), codId, 1, 1);
+ final ChannelControlBlock ccb = ncs.getNetworkManager()
+ .connect(NetworkingUtil.getSocketAddress(ncs.getNetworkManager().getLocalNetworkAddress()));
+ final NetworkOutputChannel networkOutputChannel = new NetworkOutputChannel(ccb, 0);
+ final MaterializingPipelinedPartition mpp =
+ new MaterializingPipelinedPartition(ctx, ncs.getPartitionManager(), pid, taId, ncs.getExecutor());
+ mpp.open();
+ // fill and write frame
+ final ByteBuffer frame = ctx.allocateFrame();
+ while (frame.hasRemaining()) {
+ frame.put((byte) 0);
+ }
+ frame.flip();
+ mpp.nextFrame(frame);
+ // close and deallocate before consumer thread starts
+ mpp.close();
+ mpp.deallocate();
+ // start the consumer thread after deallocate
+ mpp.writeTo(networkOutputChannel);
+ // give consumer thread chance to exit
+ TimeUnit.MILLISECONDS.sleep(100);
+ LangExecutionUtil.checkThreadLeaks();
+ LangExecutionUtil.checkOpenRunFileLeaks();
+ } finally {
+ nc.deInit();
+ }
+ }
+}
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java
index eb47248..dabf9d3 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/DiskIsFullTest.java
@@ -33,7 +33,6 @@
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.dataflow.LSMInsertDeleteOperatorNodePushable;
import org.apache.asterix.common.exceptions.ExceptionUtils;
-import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.external.util.DataflowUtils;
import org.apache.asterix.file.StorageComponentProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -49,6 +48,7 @@
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAppender;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
@@ -121,15 +121,13 @@
partitioningKeys.add(Collections.singletonList("key"));
Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
NoMergePolicyFactory.NAME, null, new InternalDatasetDetails(null, PartitioningStrategy.HASH,
- partitioningKeys, null, null, null, false, null, false),
+ partitioningKeys, null, null, null, false, null),
null, DatasetType.INTERNAL, DATASET_ID, 0);
try {
nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES,
- KEY_INDICATOR_LIST);
- IHyracksTaskContext ctx = nc.createTestContext(false);
- nc.newJobId();
- ITransactionContext txnCtx =
- nc.getTransactionManager().getTransactionContext(nc.getTxnJobId(ctx), true);
+ KEY_INDICATOR_LIST, 0);
+ JobId jobId = nc.newJobId();
+ IHyracksTaskContext ctx = nc.createTestContext(jobId, 0, false);
// Prepare insert operation
LSMInsertDeleteOperatorNodePushable insertOp = nc.getInsertPipeline(ctx, dataset, KEY_TYPES,
RECORD_TYPE, META_TYPE, null, KEY_INDEXES, KEY_INDICATOR_LIST, storageManager).getLeft();
diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java
index 2bac49e..402da6c 100644
--- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java
+++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/storage/IndexDropOperatorNodePushableTest.java
@@ -18,8 +18,6 @@
*/
package org.apache.asterix.test.storage;
-import static org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor.DropOption;
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -30,19 +28,32 @@
import org.apache.asterix.app.bootstrap.TestNodeController;
import org.apache.asterix.common.config.DatasetConfig;
+import org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.asterix.file.StorageComponentProvider;
+import org.apache.asterix.metadata.MetadataManager;
+import org.apache.asterix.metadata.MetadataTransactionContext;
+import org.apache.asterix.metadata.bootstrap.MetadataBuiltinEntities;
+import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
import org.apache.asterix.metadata.entities.InternalDatasetDetails;
+import org.apache.asterix.metadata.utils.SplitsAndConstraintsUtil;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.asterix.test.common.TestExecutor;
import org.apache.asterix.test.common.TestHelper;
+import org.apache.asterix.test.runtime.ExecutionTestUtil;
+import org.apache.asterix.testframework.context.TestCaseContext;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.io.FileSplit;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.dataflow.std.file.ConstantFileSplitProvider;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor.DropOption;
import org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorNodePushable;
import org.apache.hyracks.storage.am.lsm.common.impls.NoMergePolicyFactory;
import org.junit.After;
@@ -64,6 +75,7 @@
private static final String DATA_TYPE_NAME = "DUMMY";
private static final String NODE_GROUP_NAME = "DEFAULT";
private final AtomicBoolean dropFailed = new AtomicBoolean(false);
+ private final TestExecutor testExecutor = new TestExecutor();
@Before
public void setUp() throws Exception {
@@ -77,6 +89,12 @@
TestHelper.deleteExistingInstanceFiles();
}
+ /**
+ * Tests dropping a dataset using different
+ * drop options
+ *
+ * @throws Exception
+ */
@Test
public void dropOptionsTest() throws Exception {
TestNodeController nc = new TestNodeController(null, false);
@@ -88,15 +106,15 @@
Dataset dataset = new Dataset(DATAVERSE_NAME, DATASET_NAME, DATAVERSE_NAME, DATA_TYPE_NAME, NODE_GROUP_NAME,
NoMergePolicyFactory.NAME, null,
new InternalDatasetDetails(null, InternalDatasetDetails.PartitioningStrategy.HASH, partitioningKeys,
- null, null, null, false, null, false), null, DatasetConfig.DatasetType.INTERNAL, DATASET_ID,
- 0);
+ null, null, null, false, null),
+ null, DatasetConfig.DatasetType.INTERNAL, DATASET_ID, 0);
// create dataset
- TestNodeController.PrimaryIndexInfo indexInfo =
- nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE, META_TYPE, null, storageManager, KEY_INDEXES,
- KEY_INDICATORS_LIST);
+ TestNodeController.PrimaryIndexInfo indexInfo = nc.createPrimaryIndex(dataset, KEY_TYPES, RECORD_TYPE,
+ META_TYPE, null, storageManager, KEY_INDEXES, KEY_INDICATORS_LIST, 0);
IndexDataflowHelperFactory helperFactory =
new IndexDataflowHelperFactory(nc.getStorageManager(), indexInfo.getFileSplitProvider());
- IHyracksTaskContext ctx = nc.createTestContext(true);
+ JobId jobId = nc.newJobId();
+ IHyracksTaskContext ctx = nc.createTestContext(jobId, 0, true);
IIndexDataflowHelper dataflowHelper = helperFactory.create(ctx.getJobletContext().getServiceContext(), 0);
dropInUse(ctx, helperFactory, dataflowHelper);
dropInUseWithWait(ctx, helperFactory, dataflowHelper);
@@ -107,6 +125,47 @@
}
}
+ /**
+ * Tests dropping an index whose dataset has no active
+ * operations
+ *
+ * @throws Exception
+ */
+ @Test
+ public void dropIndexInUseTest() throws Exception {
+ TestNodeController nc = new TestNodeController(null, false);
+ try {
+ nc.init();
+ String datasetName = "ds";
+ String indexName = "fooIdx";
+ // create dataset and index
+ final TestCaseContext.OutputFormat format = TestCaseContext.OutputFormat.CLEAN_JSON;
+ testExecutor.executeSqlppUpdateOrDdl("CREATE TYPE KeyType AS { id: int, foo: int };", format);
+ testExecutor.executeSqlppUpdateOrDdl("CREATE DATASET " + datasetName + "(KeyType) PRIMARY KEY id;", format);
+ testExecutor.executeSqlppUpdateOrDdl("CREATE INDEX " + indexName + " on " + datasetName + "(foo)", format);
+ final MetadataTransactionContext mdTxn = MetadataManager.INSTANCE.beginTransaction();
+ ICcApplicationContext appCtx = (ICcApplicationContext) ExecutionTestUtil.integrationUtil
+ .getClusterControllerService().getApplicationContext();
+ MetadataProvider metadataProver = new MetadataProvider(appCtx, null);
+ metadataProver.setMetadataTxnContext(mdTxn);
+ final String defaultDv = MetadataBuiltinEntities.DEFAULT_DATAVERSE.getDataverseName();
+ final Dataset dataset = MetadataManager.INSTANCE.getDataset(mdTxn, defaultDv, datasetName);
+ MetadataManager.INSTANCE.commitTransaction(mdTxn);
+ FileSplit[] splits = SplitsAndConstraintsUtil.getIndexSplits(appCtx.getClusterStateManager(), dataset,
+ indexName, Arrays.asList("asterix_nc1"));
+ final ConstantFileSplitProvider constantFileSplitProvider =
+ new ConstantFileSplitProvider(Arrays.copyOfRange(splits, 0, 1));
+ IndexDataflowHelperFactory helperFactory =
+ new IndexDataflowHelperFactory(nc.getStorageManager(), constantFileSplitProvider);
+ JobId jobId = nc.newJobId();
+ IHyracksTaskContext ctx = nc.createTestContext(jobId, 0, true);
+ IIndexDataflowHelper dataflowHelper = helperFactory.create(ctx.getJobletContext().getServiceContext(), 0);
+ dropInUse(ctx, helperFactory, dataflowHelper);
+ } finally {
+ nc.deInit();
+ }
+ }
+
private void dropInUse(IHyracksTaskContext ctx, IndexDataflowHelperFactory helperFactory,
IIndexDataflowHelper dataflowHelper) throws Exception {
dropFailed.set(false);
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql
deleted file mode 100644
index 6674622..0000000
--- a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.1.ddl.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create a temporary dataset and verify the dataset does not exist in the metadata store
- * Expected Res : Success
- * Date : March 12 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type LineItemType as closed {
- l_orderkey: int64,
- l_partkey: int64,
- l_suppkey: int64,
- l_linenumber: int64,
- l_quantity: double,
- l_extendedprice: double,
- l_discount: double,
- l_tax: double,
- l_returnflag: string,
- l_linestatus: string,
- l_shipdate: string,
- l_commitdate: string,
- l_receiptdate: string,
- l_shipinstruct: string,
- l_shipmode: string,
- l_comment: string
-}
-
-create temporary dataset LineItem(LineItemType)
- primary key l_orderkey, l_linenumber;
-
-
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql
deleted file mode 100644
index 3e06e46..0000000
--- a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.2.update.aql
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create dataverse and drop that dataverse and verify dataverse entries in metadata
- * Expected Res : Success
- * Date : Sep 17 2012
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql b/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql
deleted file mode 100644
index 9d77309..0000000
--- a/asterixdb/asterix-app/src/test/resources/metadata/queries/basic/temp_dataset/temp_dataset.3.query.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Create dataverse and drop that dataverse and verify dataverse entries in metadata
- * Expected Res : Success
- * Date : Sep 17 2012
- */
-
-
-for $l in dataset('Metadata.Dataset')
-where $l.DataverseName = 'test'
-return $l;
-
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm b/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm
deleted file mode 100644
index 8b13789..0000000
--- a/asterixdb/asterix-app/src/test/resources/metadata/results/basic/temp_dataset/temp_dataset.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml b/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml
index 02efe62..036a4bc 100644
--- a/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/metadata/testsuite.xml
@@ -324,11 +324,6 @@
</compilation-unit>
</test-case>
<test-case FilePath="basic">
- <compilation-unit name="temp_dataset">
- <output-dir compare="Text">temp_dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="basic">
<compilation-unit name="issue_1419_drop_type_with_collection_1">
<output-dir compare="Text">issue_1419_drop_type_with_collection</output-dir>
</compilation-unit>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-64.sqlpp
similarity index 60%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-64.sqlpp
index 7e0f9cc..723a551 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-64.sqlpp
@@ -17,9 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
+ * Description : BTree Index verification test
+ * : This test is intended to verify that the secondary primary BTree index is used for aggregations
+ * : in the optimized query plan.
+ * Expected Result : Success
+ * Date : 31st Oct 2017
*/
drop dataverse test if exists;
@@ -28,18 +30,16 @@
use test;
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-64.adm";
+create type test.TestType as
+{
+ id : integer,
+ fname : string,
+ lname : string
};
-create temporary dataset MyData(MyRecord) primary key id;
+create dataset testdst(TestType) primary key id;
+create primary index on testdst;
+
+select count(*) AS count from testdst;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-65.sqlpp
similarity index 60%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-65.sqlpp
index 7e0f9cc..2de8f5b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-65.sqlpp
@@ -17,9 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
+ * Description : BTree Index verification test
+ * : This test is intended to verify that the secondary primary BTree index is used for aggregations
+ * : in the optimized query plan.
+ * Expected Result : Success
+ * Date : 31st Oct 2017
*/
drop dataverse test if exists;
@@ -28,18 +30,16 @@
use test;
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-65.adm";
+create type test.TestType as
+{
+ id : integer,
+ fname : string,
+ lname : string
};
-create temporary dataset MyData(MyRecord) primary key id;
+create dataset testdst(TestType) primary key id;
+create primary index on testdst;
+
+select count(*) AS count from testdst t where t.id > 3;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-66.sqlpp
similarity index 60%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-66.sqlpp
index 7e0f9cc..800beef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-66.sqlpp
@@ -17,9 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
+ * Description : BTree Index verification test
+ * : This test is intended to verify that the secondary primary BTree index is used for aggregations
+ * : in the optimized query plan.
+ * Expected Result : Success
+ * Date : 31st Oct 2017
*/
drop dataverse test if exists;
@@ -28,18 +30,16 @@
use test;
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-66.adm";
+create type test.TestType as
+{
+ id : integer,
+ fname : string,
+ lname : string
};
-create temporary dataset MyData(MyRecord) primary key id;
+create dataset testdst(TestType) primary key id;
+create primary index on testdst;
+
+select MAX(t.id) as maximum from testdst t;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-67.sqlpp
similarity index 60%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-67.sqlpp
index 7e0f9cc..89e6697 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/queries_sqlpp/btree-index/btree-secondary-67.sqlpp
@@ -17,9 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
+ * Description : BTree Index verification test
+ * : This test is intended to verify that the secondary primary BTree index is used for aggregations
+ * : in the optimized query plan.
+ * Expected Result : Success
+ * Date : 31st Oct 2017
*/
drop dataverse test if exists;
@@ -28,18 +30,16 @@
use test;
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
+write output to asterix_nc1:"rttest/btree-index_btree-secondary-67.adm";
+create type test.TestType as
+{
+ id : integer,
+ fname : string,
+ lname : string
};
-create temporary dataset MyData(MyRecord) primary key id;
+create dataset testdst(TestType) primary key id;
+create primary index on testdst;
+
+select count(t.id) as count from testdst t;
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-64.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-64.plan
new file mode 100644
index 0000000..d0280bc
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-64.plan
@@ -0,0 +1,13 @@
+-- DISTRIBUTE_RESULT |UNPARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |UNPARTITIONED|
+ -- STREAM_PROJECT |UNPARTITIONED|
+ -- ASSIGN |UNPARTITIONED|
+ -- AGGREGATE |UNPARTITIONED|
+ -- RANDOM_MERGE_EXCHANGE |PARTITIONED|
+ -- AGGREGATE |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-65.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-65.plan
new file mode 100644
index 0000000..011a15f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-65.plan
@@ -0,0 +1,14 @@
+-- DISTRIBUTE_RESULT |UNPARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |UNPARTITIONED|
+ -- STREAM_PROJECT |UNPARTITIONED|
+ -- ASSIGN |UNPARTITIONED|
+ -- AGGREGATE |UNPARTITIONED|
+ -- RANDOM_MERGE_EXCHANGE |PARTITIONED|
+ -- AGGREGATE |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- STREAM_PROJECT |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- ASSIGN |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-66.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-66.plan
new file mode 100644
index 0000000..697008a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-66.plan
@@ -0,0 +1,11 @@
+-- DISTRIBUTE_RESULT |UNPARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |UNPARTITIONED|
+ -- STREAM_PROJECT |UNPARTITIONED|
+ -- ASSIGN |UNPARTITIONED|
+ -- AGGREGATE |UNPARTITIONED|
+ -- RANDOM_MERGE_EXCHANGE |PARTITIONED|
+ -- AGGREGATE |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-67.plan b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-67.plan
new file mode 100644
index 0000000..697008a
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results/btree-index/btree-secondary-67.plan
@@ -0,0 +1,11 @@
+-- DISTRIBUTE_RESULT |UNPARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |UNPARTITIONED|
+ -- STREAM_PROJECT |UNPARTITIONED|
+ -- ASSIGN |UNPARTITIONED|
+ -- AGGREGATE |UNPARTITIONED|
+ -- RANDOM_MERGE_EXCHANGE |PARTITIONED|
+ -- AGGREGATE |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- BTREE_SEARCH |PARTITIONED|
+ -- ONE_TO_ONE_EXCHANGE |PARTITIONED|
+ -- EMPTY_TUPLE_SOURCE |PARTITIONED|
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
index 91e53d8..c651db5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
@@ -67,7 +67,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -95,7 +95,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
index 634647d..e6774a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
@@ -67,7 +67,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -109,7 +109,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_01.ast
index de81aed..0d8d9c7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_01.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_02.ast
index dcd7ab5..24a9ddf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_02.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_03.ast
index 9a5df78..6f52621 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-join_03.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.ast
index b095188..c19d610b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_01.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.ast
index 31c5af0..d35461f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_02.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.ast
index ca4fecf..454a34d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_03.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.ast
index 60b812b..e601de0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_04.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.ast
index fb0b3ac..018e3e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_05.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.ast
index a6ad0f3..46f0088 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-composite-key-prefix-join_06.ast
@@ -22,12 +22,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-multipred.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-multipred.ast
index ee3eae8..05b9150 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-multipred.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-multipred.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_01.ast
index 9f7c12c..85ce2d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_01.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_02.ast
index 6794f96..db8b535 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join-neg_02.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_01.ast
index c15b75c..9fbb8f1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_01.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_02.ast
index 6a3eeb1..dd2d5c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_02.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_03.ast
index 58db75b..de18311 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_03.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_04.ast
index f1a48c1..0491e3e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_04.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_05.ast
index 4f5078b..4a6b962 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-equi-join_05.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_01.ast
index 8cde586..e99a722 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_01.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_02.ast
index 98d29cc..968d0ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-ge-join_02.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_01.ast
index 10f3324..aaa16a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_01.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_02.ast
index 9923779..53c60ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-gt-join_02.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_01.ast
index 6a8fb8d..7c6cd3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_01.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_02.ast
index 21fb361..d97a727 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-le-join_02.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_01.ast
index 60f1848..9a305b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_01.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_02.ast
index fe67f96..ae4c9ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/primary-lt-join_02.ast
@@ -13,12 +13,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multiindex.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multiindex.ast
index 15a3847..33c4c27 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multiindex.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multiindex.ast
@@ -71,12 +71,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multipred.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multipred.ast
index ae18847..3f300f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multipred.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join-multipred.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_01.ast
index bcc9a3d..be9b0b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_02.ast
index b581216..a86a18a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_03.ast
index dd29bbd..b812eb9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_04.ast
index fc898df..76b19a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_04.ast
@@ -12,12 +12,12 @@
SELECT [
*
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$a ]
INNER JOIN
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst2]
]
AS Variable [ Name=$b ]
@@ -34,7 +34,7 @@
]
]
INNER JOIN
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst3]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_05.ast
index 589b5e1..b257ea9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_05.ast
@@ -17,7 +17,7 @@
]
AS Variable [ Name=$bar ]
INNER JOIN
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$testdst ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast
index 141ee40..b29f485 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index-join/secondary-equi-join_06.ast
@@ -27,7 +27,7 @@
]
null
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$testdst ]
@@ -35,7 +35,7 @@
Groupby
Variable [ Name=$val ]
:=
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [val]
Variable [ Name=$testdst ]
]
@@ -47,7 +47,7 @@
)
AS Variable [ Name=$bar ]
INNER JOIN
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst2]
]
AS Variable [ Name=$testdst2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast
index 8aea035..7adbc88 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-01.ast
@@ -15,7 +15,7 @@
Field=message
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CHPReports]
]
AS Variable [ Name=$emergency ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast
index dbf643e..2fa6945 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-02.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emergency ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CHPReports]
]
AS Variable [ Name=$emergency ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast
index 28e2f15..a100a3e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-03.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emergency ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CHPReports]
]
AS Variable [ Name=$emergency ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast
index d133226..0ec3cd0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-datetime-04.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emergency ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CHPReports]
]
AS Variable [ Name=$emergency ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-01.ast
index ca6b464..7b3bf45 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-01.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-02.ast
index 4ff1776..b812123 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-02.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-03.ast
index 72f6e53..f179893 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-03.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-04.ast
index 4c7d7e2..35007a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-04.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-05.ast
index 888d8bb..36f99aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-05.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-06.ast
index 8d4e7c7..f956240 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-06.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-07.ast
index e07b6a3..acc2d60 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-07.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-08.ast
index 3bde6c3..e3f78ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-08.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-09.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-09.ast
index 193ba2f..93f134d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-09.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-09.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-10.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-10.ast
index 7c934ef..ef6d395 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-10.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-10.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-11.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-11.ast
index d14d1610..90e968e1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-11.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-11.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-12.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-12.ast
index 74507b1..bb0044e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-12.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-12.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-13.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-13.ast
index 3a1e8c2..3be48c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-13.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-13.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-14.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-14.ast
index 105c9e8..e9abc79 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-14.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-14.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-15.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-15.ast
index 5ef21e9..c74f6cd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-15.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-15.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-16.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-16.ast
index a83918f..5396d58 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-16.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-16.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-17.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-17.ast
index 5335a9d..2b11d7c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-17.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-17.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-18.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-18.ast
index a083cae..3ec50ff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-18.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-18.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-19.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-19.ast
index acee21f..c3fcaca 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-19.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-19.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-20.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-20.ast
index 8daf39c..84d64b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-20.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-20.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-21.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-21.ast
index d6f14a4..e9b7a47 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-21.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-21.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-22.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-22.ast
index 9fefece..0675fd5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-22.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-22.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-23.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-23.ast
index d42ddff..5e0a2dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-23.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-23.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-24.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-24.ast
index 8b60775..3255d5b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-24.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-24.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-25.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-25.ast
index 3de69d0..daa004f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-25.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-25.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-26.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-26.ast
index 744b9e1..d066cec 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-26.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-26.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-27.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-27.ast
index 47b67c8..f0353a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-27.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-27.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-28.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-28.ast
index 11b9e3a..0723ab3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-28.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-28.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-29.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-29.ast
index 8e90953..60d8267 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-29.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-29.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-30.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-30.ast
index 75d9cba..b4fcf3c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-30.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-30.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-31.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-31.ast
index 39a45ef..04bc378 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-31.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-31.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-32.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-32.ast
index 454d067..452717c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-32.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-primary-32.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-33.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-33.ast
index 95b4200..6377bcf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-33.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-33.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-34.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-34.ast
index 8dd2668..bedbe96 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-34.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-34.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-35.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-35.ast
index 719d911..bbee93d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-35.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-35.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-36.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-36.ast
index 7645930..ddb7101 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-36.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-36.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-37.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-37.ast
index 1f18352..5f9b7c6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-37.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-37.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-38.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-38.ast
index 60d9877..055a705 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-38.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-38.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-39.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-39.ast
index e010213..3e6c33b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-39.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-39.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-40.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-40.ast
index 31073b2..c33a92c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-40.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-40.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-41.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-41.ast
index d1c498a..b361d8b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-41.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-41.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-42.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-42.ast
index 9f8f1f3..eb0f4c4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-42.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-42.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-43.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-43.ast
index 82fbc31..dcfb1ad 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-43.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-43.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-44.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-44.ast
index 4b9bb99..1eaf3bfe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-44.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-44.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-45.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-45.ast
index 974f3e2..f64aa75 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-45.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-45.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-46.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-46.ast
index a6aa58d..f114426 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-46.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-46.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-47.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-47.ast
index eec8852..204c8f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-47.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-47.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-48.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-48.ast
index 8309073..4d253e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-48.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-48.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-49.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-49.ast
index dcafe2a..0dac72b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-49.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-49.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-50.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-50.ast
index 1213868..6b3c766 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-50.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-50.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-51.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-51.ast
index fdd3002..5f0dc8b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-51.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-51.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-52.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-52.ast
index 84213c9..ea0297e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-52.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-52.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-53.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-53.ast
index 1b6663f..84740aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-53.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-53.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-54.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-54.ast
index 35efa3f..7d97c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-54.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-54.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-55.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-55.ast
index c1c49c0..1a2b297 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-55.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-55.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-56.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-56.ast
index 96932ef..8b94523 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-56.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-56.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-57.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-57.ast
index 8b68fad..4b1101e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-57.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-57.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-58.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-58.ast
index 47ae9ca..db6037e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-58.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-58.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-59.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-59.ast
index 25c9303..f758d69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-59.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-59.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-60.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-60.ast
index 303fa65..27c5789 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-60.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-60.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-61.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-61.ast
index bad9dc2..2d86fa7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-61.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-61.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-62.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-62.ast
index 663d35f..af8f846 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-62.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-62.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-63.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-63.ast
index 04a40fa..e570a69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-63.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-63.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast
new file mode 100644
index 0000000..b3036cb
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-64.ast
@@ -0,0 +1,30 @@
+DataverseUse test
+WriteOutputTo asterix_nc1:rttest/btree-index_btree-secondary-64.adm
+TypeDecl TestType [
+ open RecordType {
+ id : integer,
+ fname : string,
+ lname : string
+ }
+]
+DatasetDecl testdst(TestType) partitioned by [[id]]
+Query:
+SELECT [
+FunctionCall asterix.sql-count@1[
+ (
+ SELECT ELEMENT [
+ LiteralExpr [LONG] [1]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS Variable [ Name=#2 ]
+ ]
+ )
+]
+count
+]
+FROM [ FunctionCall asterix.dataset@1[
+ LiteralExpr [STRING] [testdst]
+ ]
+ AS Variable [ Name=$testdst ]
+]
+Group All
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast
new file mode 100644
index 0000000..cbb7874
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-65.ast
@@ -0,0 +1,39 @@
+DataverseUse test
+WriteOutputTo asterix_nc1:rttest/btree-index_btree-secondary-65.adm
+TypeDecl TestType [
+ open RecordType {
+ id : integer,
+ fname : string,
+ lname : string
+ }
+]
+DatasetDecl testdst(TestType) partitioned by [[id]]
+Query:
+SELECT [
+FunctionCall asterix.sql-count@1[
+ (
+ SELECT ELEMENT [
+ LiteralExpr [LONG] [1]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS Variable [ Name=#2 ]
+ ]
+ )
+]
+count
+]
+FROM [ FunctionCall asterix.dataset@1[
+ LiteralExpr [STRING] [testdst]
+ ]
+ AS Variable [ Name=$t ]
+]
+Where
+ OperatorExpr [
+ FieldAccessor [
+ Variable [ Name=$t ]
+ Field=id
+ ]
+ >
+ LiteralExpr [LONG] [3]
+ ]
+Group All
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast
new file mode 100644
index 0000000..e596270
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-66.ast
@@ -0,0 +1,36 @@
+DataverseUse test
+WriteOutputTo asterix_nc1:rttest/btree-index_btree-secondary-66.adm
+TypeDecl TestType [
+ open RecordType {
+ id : integer,
+ fname : string,
+ lname : string
+ }
+]
+DatasetDecl testdst(TestType) partitioned by [[id]]
+Query:
+SELECT [
+FunctionCall asterix.sql-max@1[
+ (
+ SELECT ELEMENT [
+ FieldAccessor [
+ FieldAccessor [
+ Variable [ Name=#2 ]
+ Field=t
+ ]
+ Field=id
+ ]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS Variable [ Name=#2 ]
+ ]
+ )
+]
+maximum
+]
+FROM [ FunctionCall asterix.dataset@1[
+ LiteralExpr [STRING] [testdst]
+ ]
+ AS Variable [ Name=$t ]
+]
+Group All
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast
new file mode 100644
index 0000000..027e42d
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/btree-index/btree-secondary-67.ast
@@ -0,0 +1,36 @@
+DataverseUse test
+WriteOutputTo asterix_nc1:rttest/btree-index_btree-secondary-67.adm
+TypeDecl TestType [
+ open RecordType {
+ id : integer,
+ fname : string,
+ lname : string
+ }
+]
+DatasetDecl testdst(TestType) partitioned by [[id]]
+Query:
+SELECT [
+FunctionCall asterix.sql-count@1[
+ (
+ SELECT ELEMENT [
+ FieldAccessor [
+ FieldAccessor [
+ Variable [ Name=#2 ]
+ Field=t
+ ]
+ Field=id
+ ]
+ ]
+ FROM [ Variable [ Name=#1 ]
+ AS Variable [ Name=#2 ]
+ ]
+ )
+]
+count
+]
+FROM [ FunctionCall asterix.dataset@1[
+ LiteralExpr [STRING] [testdst]
+ ]
+ AS Variable [ Name=$t ]
+]
+Group All
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/collocated.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/collocated.ast
index 952d004..f2a6881 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/collocated.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/collocated.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Visitors]
]
AS Variable [ Name=$visitor ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast
index 91064d9..ec05f60 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-complex.ast
@@ -25,7 +25,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-simple.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-simple.ast
index 32cfc91..dde4986 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-simple.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/consolidate-selects-simple.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast
index 133b650..a0bee23 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/count-tweets.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterData]
]
AS Variable [ Name=$t ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tokens]
]
AS Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/cust_group_no_agg.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/cust_group_no_agg.ast
index 48b11ff..8663144 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/cust_group_no_agg.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/cust_group_no_agg.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$name ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast
index cf3721d..6cf99d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/denorm-cust-order.ast
@@ -43,7 +43,7 @@
(
LiteralExpr [STRING] [cust]
:
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [cust]
Variable [ Name=$cid ]
Variable [ Name=#1 ]
@@ -69,7 +69,7 @@
(
LiteralExpr [STRING] [orders]
:
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o]
Variable [ Name=$cid ]
Variable [ Name=#1 ]
@@ -77,12 +77,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast
index 7dfc9a1..cbf0d66 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/distinct_aggregate.ast
@@ -73,7 +73,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems_q1]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/filter-nested.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/filter-nested.ast
index 3819ead..a610862 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/filter-nested.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/filter-nested.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast
index 8528d84..3901eaf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-dblp-csx.ast
@@ -35,22 +35,22 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tokensDBLP]
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tokensCSX]
]
AS Variable [ Name=$prefixTokenCSX ]
@@ -85,14 +85,14 @@
Field=title
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
]
)
AS Variable [ Name=$tokenRanked ]
- AT
+ AT
Variable [ Name=$i ]
]
Where
@@ -136,14 +136,14 @@
Field=title
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
]
)
AS Variable [ Name=$tokenRanked ]
- AT
+ AT
Variable [ Name=$i ]
]
Where
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast
index 4d5fe2b..2e739a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase1.ast
@@ -36,7 +36,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$user ]
@@ -57,7 +57,7 @@
SELECT ELEMENT [
Variable [ Name=$item ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast
index 595e2cb..19048f6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/fj-phase2-with-hints.ast
@@ -28,7 +28,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP_fuzzyjoin_078]
]
AS Variable [ Name=$paperDBLP ]
@@ -54,7 +54,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP_fuzzyjoin_078]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/hashjoin-with-unnest.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/hashjoin-with-unnest.ast
index 45bdd94..cffbfba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/hashjoin-with-unnest.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/hashjoin-with-unnest.ast
@@ -23,12 +23,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$m ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$n ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast
index 2f16552..5fc59bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inlined_q18_large_volume_customer.ast
@@ -87,7 +87,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$j ]
@@ -97,12 +97,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -126,7 +126,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -136,7 +136,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$l ]
@@ -156,7 +156,7 @@
)
AS Variable [ Name=$t ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/introhashpartitionmerge.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/introhashpartitionmerge.ast
index 982989c..7462eba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/introhashpartitionmerge.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/introhashpartitionmerge.ast
@@ -14,7 +14,7 @@
Field=rank
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TOKENSRANKEDADM]
]
AS Variable [ Name=$token1 ]
@@ -23,7 +23,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenRanked ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TOKENSRANKEDADM]
]
AS Variable [ Name=$tokenRanked ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast
index 56389af..0292491 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains-panic.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast
index 4647d35..cc5ec5e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-contains.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast
index df255ab..4be98a5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast
index 2a927e0..9e210d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-check.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast
index 3ec78a2..168d60a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast
index 3c737f8..e883031 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-edit-distance.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
index 77d8b6f..c87a1b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index b79c9e5..c5002cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast
index 7e924cc..cedd0a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard-check.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast
index 8649d0b..f397f12 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ngram-jaccard.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast
index 3ebbe43..6d250a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check-panic.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast
index 9c1ae38..5a74ae8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-check.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast
index 70b342f..1854372 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance-panic.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast
index 292183a..d87761d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-edit-distance.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
index 3d2e76f..e526579 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
@@ -30,7 +30,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.ast
index d43d96d..f849d9e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-fuzzyeq-jaccard.ast
@@ -30,7 +30,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast
index cee92b5..8b40998 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard-check.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast
index 57cdedf..9308695 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/olist-jaccard.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
index 9679cce..60b9963 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
@@ -30,7 +30,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast
index 16cfff9..c6207b1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard-check.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast
index c3d0c15..bf87534 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/ulist-jaccard.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast
index 55076fa..c277928 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-contains.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast
index 3742b4b..62e8d9a8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast
index 7f14b74..aa8b7b4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard-check.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast
index 5e1bf73..6be4bc0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-basic/word-jaccard.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index def528d..e1333ac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index b96e02a..884bc4b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 59aaf68..6e549ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast
index ce9a6ac..2b5c09f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 3b99da0..7e78336 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -31,7 +31,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index f6a75d9..2d14750 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -31,7 +31,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast
index 6462966..425203e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index eabc337..859906d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast
index e63b966..74285b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let-panic.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast
index 16b17d7..210984a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-edit-distance-check-let.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast
index e9048e6..2db300d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/olist-jaccard-check-let.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast
index 89c5d25..f6072f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/ulist-jaccard-check-let.ast
@@ -28,7 +28,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast
index 9db1fba..d1bb2f0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-let.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast
index efa64a5..04be064 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -25,7 +25,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast
index 4af417c..308d11c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast
index 18c2dd2..d642fc9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance.ast
@@ -41,12 +41,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.ast
index 2cdb356..328ceef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-edit-distance.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast
index 75f879d..f823019 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-fuzzyeq-jaccard.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast
index 0ecd9c9..9995185 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast
index f4d4aa2..22159e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast
index 19c22b6..d66f32b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline.ast
@@ -50,12 +50,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast
index 0aea7e8..5ed0966 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.ast
index 3520b20..0a5999d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-edit-distance.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.ast
index efeb564..f3ab828 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-fuzzyeq-jaccard.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast
index 5c2bebc..0a1f376 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline.ast
@@ -50,12 +50,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast
index 066a527..00931c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.ast
index 8712516..5bfa3c5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-fuzzyeq-jaccard.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast
index 3240a70..e582ca7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline.ast
@@ -50,12 +50,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast
index d5985bd..a55887d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast
index 65a2fe2..e159597 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-fuzzyeq-jaccard.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast
index a14d016..28eb045 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast
index fffedbd..a534127 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard.ast
@@ -41,12 +41,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast
index bbd397c..a0bf940 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/issue741.ast
@@ -43,7 +43,7 @@
Field=tweetid
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index 0aa744a..987b915 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -73,7 +73,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -121,7 +121,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
index 3852df8..b026407 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
@@ -73,7 +73,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -121,7 +121,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast
index c26c8cb..805ccf7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-contains.ast
@@ -31,12 +31,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast
index e3821b0..503ce96 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast
index ae63e3d..0487681 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast
index 5709b45..97d2b9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast
index 1b5ba0c..5fa2dbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-check_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast
index 3cae2a3..7ef75ed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-contains.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast
index db1ad32..fbe9601 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast
index c28ea30..43325c1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast
index 129caed..5f83202 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast
index 56af5ec..49370eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-edit-distance_04.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
index ef81304..3942989 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
index ef81304..3942989 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
index 9a4c3a1..04fa7af 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index a87fcf5..cfbcc0d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -38,12 +38,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
index 0fa3286..f4c02e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
@@ -38,12 +38,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
index b0eb79d..6c030fb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast
index 7115f28..e90170e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_01.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast
index 26fc4de..76756f4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_02.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast
index b3f6815..398785f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_03.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast
index 9a784e3..135b67c3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard-check_04.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast
index 0507902..a36f961 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_01.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast
index 7e9a44e..2eed8ac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_02.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast
index a95b3ea..5c0fbeb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_03.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast
index 28f796f..6588965 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ngram-jaccard_04.ast
@@ -31,12 +31,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast
index 7a54640..78531ac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast
index 171b815..6b979a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast
index 7b6031c..aaa87e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_03.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast
index fa3418f..d777d72 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance-check_04.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast
index d2c4f7b..92eb91e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast
index cdf9538..92bef7b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast
index 217c7dc..9a8ef3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_03.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast
index f16a5e4..999fd11 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-edit-distance_04.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
index fe6c7a2..e220b66 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.ast
index 93220c7..3c99609 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_02.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.ast
index 2e9ab0d..9296f4d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-edit-distance_03.ast
@@ -41,12 +41,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
index 3eda323..e0e9db5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.ast
index 4ed2a88..1d85405 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_02.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.ast
index 61d8d4d..644a793 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-fuzzyeq-jaccard_03.ast
@@ -41,12 +41,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast
index 4307a46..97828e8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast
index b30a900..f902dac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast
index 8f7baa7..953a3c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_03.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast
index 16ba8e9..050f9b7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard-check_04.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast
index 4877699..79bd394 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast
index f77ea6f..113da91 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast
index 7539483..9272c4e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_03.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast
index c442cbc..dd6326a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/olist-jaccard_04.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
index 520ebdd..2268164 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.ast
index 370f544..e4cbdbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_02.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.ast
index 86e7a4f..f704b0d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-fuzzyeq-jaccard_03.ast
@@ -41,12 +41,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast
index 9bbdb3c..5c64228 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast
index 9a1af12..beda4f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast
index 97db320..3d80527 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_03.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast
index d879470..f402d6b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard-check_04.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast
index d27043e..ce46f66 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast
index 2d03cb0..5857417 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast
index 6bb1584..8904afc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_03.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast
index 0186075..1805601 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/ulist-jaccard_04.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index 48a554b..78edb03 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index f3ae39a..384c900 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index ca4a606..b14f3d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 1569c8c..7e12812 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -53,12 +53,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast
index 77f67a4..a133aee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast
index f29a515..46d72df 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast
index 8ef39a5..3f5a78d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast
index ae3cbbf..e5d9054 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard-check_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast
index a555af8..b3990eb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast
index a462d2d..e3e59e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast
index a570416..4f0ebe0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast
index 4b50953..b635285 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/inverted-index-join/word-jaccard_04.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_01.ast
index 9bfa8ca..01f745f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_01.ast
@@ -76,12 +76,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$li ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [PartSupp]
]
AS Variable [ Name=$ps ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_02.ast
index 7e77a62..f870698 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/join-super-key_02.ast
@@ -76,12 +76,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [PartSupp]
]
AS Variable [ Name=$ps ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$li ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/limit-issue353.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/limit-issue353.ast
index 561f290..8eae936 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/limit-issue353.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/limit-issue353.ast
@@ -50,7 +50,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_01.ast
index ed8bc8a..d85ecac 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_01.ast
@@ -78,7 +78,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$li ]
@@ -89,7 +89,7 @@
SELECT ELEMENT [
Variable [ Name=$ps ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [PartSupp]
]
AS Variable [ Name=$ps ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_02.ast
index 881fd14..b626b88 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/loj-super-key_02.ast
@@ -78,7 +78,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [PartSupp]
]
AS Variable [ Name=$ps ]
@@ -89,7 +89,7 @@
SELECT ELEMENT [
Variable [ Name=$li ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$li ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nest_aggregate.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nest_aggregate.ast
index bb1b519..0434a09 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nest_aggregate.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nest_aggregate.ast
@@ -117,12 +117,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
@@ -176,7 +176,7 @@
Field=o_totalprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [orders]
]
AS Variable [ Name=$o ]
@@ -193,12 +193,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/disjunction-to-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/disjunction-to-join.ast
index 070f91b..5f8b8e9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/disjunction-to-join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/disjunction-to-join.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
index deed5d1..7782420 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01.ast
@@ -84,7 +84,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -121,7 +121,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
index be4dee4..8169a68 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02.ast
@@ -84,7 +84,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -141,7 +141,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.ast
index ab8d56a..eb31f70 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_01.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.ast
index d9eb12d..82f1701 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_02.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.ast
index c974456..81f875d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-join_03.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.ast
index fbc638b..1c69cef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_01.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.ast
index ce857c4..136e99e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_02.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.ast
index 6d67f1a..bb3a688 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_03.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.ast
index 6507a34..032a3a4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_04.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.ast
index d621592..c2d5b41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_05.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.ast
index 1853548..03347b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-composite-key-prefix-join_06.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.ast
index c4f686a..cd34059 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-multipred.ast
@@ -63,12 +63,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.ast
index 5c6c00b..cab3285 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join-neg_01.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_01.ast
index bbfdc0a..169ac13 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_01.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_02.ast
index 98bf5a3..41a0dff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_02.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_03.ast
index c8f2c68..352674b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_03.ast
@@ -63,12 +63,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_04.ast
index 991d6f9..8e50944 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_04.ast
@@ -63,12 +63,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_05.ast
index 64c9753..4d22f5f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-equi-join_05.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-ge-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-ge-join_01.ast
index ec71364..5c842dd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-ge-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-ge-join_01.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-gt-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-gt-join_01.ast
index ff8fed5..4876514 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-gt-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-gt-join_01.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-le-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-le-join_01.ast
index 4819dae..068153b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-le-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-le-join_01.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-lt-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-lt-join_01.ast
index 76648f8..fdcaf32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-lt-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/primary-lt-join_01.ast
@@ -18,12 +18,12 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsOne]
]
AS Variable [ Name=$x ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.DsTwo]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.ast
index dd05817..5290e8b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multiindex.ast
@@ -93,12 +93,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.ast
index 8d78dba..73fcee1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join-multipred.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.ast
index 2a51bd0..eae9e42 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index-join/secondary-equi-join_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-01.ast
index bb6e09f..915946f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-01.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-02.ast
index b9dd560..0ecfa7c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-02.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-03.ast
index 0645497..2848299 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-03.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-04.ast
index 1aaeaa2..c343009 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-04.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-05.ast
index 6c31abd..0b96c47 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-05.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-06.ast
index 3f6e7d0..4909937 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-06.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-07.ast
index 7f0c74d..0658ef9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-07.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-08.ast
index 814f90d..3d1a9e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-08.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-09.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-09.ast
index 67d07fb..95f2393 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-09.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-09.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-10.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-10.ast
index 8d57254..cb32d5e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-10.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-10.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-11.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-11.ast
index b284429..6db2388 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-11.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-11.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-12.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-12.ast
index 6a1d26c..a42d804 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-12.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-12.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-13.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-13.ast
index d01636c..b856abc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-13.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-13.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-14.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-14.ast
index 552fdfc..72bd978 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-14.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-14.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-15.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-15.ast
index 9c2cbe0..8bf87a6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-15.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-15.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-16.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-16.ast
index b913a84..48069ba 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-16.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-16.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-17.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-17.ast
index 16c6ece..e08c23d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-17.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-17.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-18.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-18.ast
index 82d3a6c..e17a21a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-18.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-18.ast
@@ -19,7 +19,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-19.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-19.ast
index e0102ee..fa404d7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-19.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-19.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-20.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-20.ast
index 6d4840b..6ce65ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-20.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-20.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-21.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-21.ast
index 30cefb2..eced9ad 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-21.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-21.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-22.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-22.ast
index b2a3420..99675fb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-22.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-22.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-23.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-23.ast
index a5d3b08..d4f6776 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-23.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-23.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-24.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-24.ast
index 243029f..9377d84 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-24.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-24.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-25.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-25.ast
index 514367c..f9ffdbd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-25.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-25.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-26.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-26.ast
index b1284cf..c88d46f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-26.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-26.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-27.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-27.ast
index d3eba3c..740da32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-27.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-27.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-28.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-28.ast
index 3371da9..a59baea 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-28.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-28.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-29.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-29.ast
index c7e0cdd..5e922b7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-29.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-29.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-30.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-30.ast
index 37be516..6147365 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-30.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-30.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-31.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-31.ast
index 38ae6d6..3fc93c06 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-31.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-31.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-32.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-32.ast
index 8e78d4b..649d870 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-32.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-primary-32.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-33.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-33.ast
index 1d5a449..f69ecff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-33.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-33.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-34.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-34.ast
index e005a94..a956d1c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-34.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-34.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-35.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-35.ast
index 8b7c456..2e15bc6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-35.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-35.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-36.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-36.ast
index 8a488b7..aec0546 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-36.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-36.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-37.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-37.ast
index 320d929..81b5949 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-37.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-37.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-38.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-38.ast
index dcc50b5..9f40591 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-38.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-38.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-39.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-39.ast
index 48a221f..b20477e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-39.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-39.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-40.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-40.ast
index 0333dfb..356d108 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-40.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-40.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-41.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-41.ast
index 294f17a..1366f1d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-41.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-41.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-42.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-42.ast
index 22bebdc..0400637 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-42.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-42.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-43.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-43.ast
index 4d71f72..47ec08b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-43.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-43.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-44.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-44.ast
index 150bc3a..2b0b8a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-44.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-44.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-45.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-45.ast
index d49ec6e..cd9d44d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-45.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-45.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-46.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-46.ast
index 391a181..7756904 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-46.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-46.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-47.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-47.ast
index 8682ec5..6305672 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-47.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-47.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-48.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-48.ast
index e152677..95b20f8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-48.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-48.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-49.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-49.ast
index 1d75cea..c701852 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-49.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-49.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-50.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-50.ast
index 5fb1eb6..49021dc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-50.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-50.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-51.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-51.ast
index 15c39e2..15c54e5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-51.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-51.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-52.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-52.ast
index 888f043..67fe175 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-52.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-52.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-53.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-53.ast
index 32f3a02..9f06b63 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-53.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-53.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-54.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-54.ast
index 68ddbd4..7098b2b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-54.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-54.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-55.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-55.ast
index 8d9e6eb..cfe7ea8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-55.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-55.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-56.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-56.ast
index 91bd1eb..5c612a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-56.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-56.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-57.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-57.ast
index 36bc794..8e1d334 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-57.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-57.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-58.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-58.ast
index 856276a..36677b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-58.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-58.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-59.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-59.ast
index dc27c49..8560c48 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-59.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-59.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-60.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-60.ast
index 45c480e..3ac9f02 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-60.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-60.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-61.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-61.ast
index bda2974..e312d7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-61.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-61.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-62.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-62.ast
index c6bd724..98232b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-62.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-62.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-63.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-63.ast
index 92c2c3a..2d32ef5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-63.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/btree-index/btree-secondary-63.ast
@@ -17,7 +17,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast
index 7dfee3a..80bd68c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains-panic.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast
index 4cf33f0..008c293 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-contains.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
index 370d446..48f1010 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast
index a8afba9..965487e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-check.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast
index e5658da..f1acd15 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast
index 7086ea0..9dd4f8f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-edit-distance.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
index 33035b7..38c9761 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
@@ -21,7 +21,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index 44e26f5..f4e5214 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -22,7 +22,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
index 7414699..4398e50 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard-check.ast
@@ -20,7 +20,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
index 21c6e81..e622079 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ngram-jaccard.ast
@@ -20,7 +20,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
index 81ae9bf..3884eda 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check-panic.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
index 1753700..ac789e8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-check.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
index 60e740c..8115f86 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance-panic.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
index 2066429..62fcc6e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-edit-distance.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
index e6b0d33..e778b1d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-edit-distance.ast
@@ -35,7 +35,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
index e36bce4..2bbed61 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-fuzzyeq-jaccard.ast
@@ -35,7 +35,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
index 766e622..7ea7ea4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard-check.ast
@@ -33,7 +33,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
index a4c5bf6..b747704 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/olist-jaccard.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
index e33d0ce..093025e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-fuzzyeq-jaccard.ast
@@ -36,7 +36,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
index a4a9879..76f6453 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard-check.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
index bf7fb93..1c0f713 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/ulist-jaccard.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
index 6da4c73..7910454 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-contains.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
index cc8bfc0..ffeca7c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -21,7 +21,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
index f972712..2d6fd99 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard-check.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
index e9f84798..700897f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-basic/word-jaccard.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index 704d815..6006e1a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index a8fd351..116ff24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 5a93885..60ab4dd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
index 9b02a4e..3c3ca41 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 7581d8d..3263af8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -42,7 +42,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index c935aae..33964a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -42,7 +42,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
index f31064d..337b6f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -20,7 +20,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index a50fd2f..34a8ee3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -31,7 +31,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
index 572c59d..9c4992d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let-panic.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
index 859b2c1..3f9145c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-edit-distance-check-let.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
index d4bec43..40ddb6a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/olist-jaccard-check-let.ast
@@ -33,7 +33,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
index 873107f..21012d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/ulist-jaccard-check-let.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
index a0eb543..ff5a737 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-let.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
index d9c65f6..5c6b4f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -30,7 +30,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index 6df9bb1..4531900 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -90,7 +90,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -153,7 +153,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
index e0ec549..8986147 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-jaccard-check-idx_01.ast
@@ -90,7 +90,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -153,7 +153,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
index 420723a..eac229b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
index 78f3fe7..e1fcdfc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-contains.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
index 90e59a0..6a6f112 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance-inline.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
index e2d9b25..854a580 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-edit-distance_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
index f0c7b7f..a4c8a94 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index 6c6bd8c..f85ac4e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
index 6db6a5d..337d4cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-check_01.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
index 289f8da..d973a37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard-inline.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
index 4763edc..b004ba3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ngram-jaccard_01.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
index 8d7f95a..a8112ee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-check_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
index 2df37e9..1bb08e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance-inline.ast
@@ -62,12 +62,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
index a04210e..05fe537 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-edit-distance_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
index abfb1ac..fb1c6be 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-edit-distance_01.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
index 9e68d75..e914bc4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-fuzzyeq-jaccard_01.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
index c430b4e..df63f49 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-check_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
index ead2509..063acd6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard-inline.ast
@@ -62,12 +62,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
index bceac1d..9e8c9b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/olist-jaccard_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
index 91f7838..cbd11fd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-fuzzyeq-jaccard_01.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
index ac0603d..11c185e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-check_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
index e1eba33..5f7041f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard-inline.ast
@@ -62,12 +62,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
index fca8e85..22ea03a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/ulist-jaccard_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index 42c94d8..c70eb94 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 8eaaa9b..48fab40 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -64,12 +64,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
index c1a2b32..7048346 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-check_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
index bf78930..ea0f164 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard-inline.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
index c883e13..905319f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/inverted-index-join/word-jaccard_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index 45f442f..42380c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -84,7 +84,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -111,7 +111,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 6958ec3..f353fc3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -84,7 +84,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -134,7 +134,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
index 50b50a6..eacc2a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
index 9e68e92..df43291 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
index 9f2f3e5..5fe1c64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-index/rtree-index-join/spatial-intersect-point_03.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.ast
index 3055c2d..47dd32a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/disjunction-to-join.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
index 4f36425..4c6e502 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
@@ -83,7 +83,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -120,7 +120,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
index 15ba229..5850f23 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
@@ -82,7 +82,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -119,7 +119,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
index 5718c4b..20f39bd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
@@ -83,7 +83,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -140,7 +140,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
index 50a1282..578a0a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
@@ -82,7 +82,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -139,7 +139,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.ast
index 48f2b7b..e36e3d8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_01.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.ast
index 4b7ffc5..263fe69 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_02.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.ast
index 75b8db3..556245e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-join_03.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.ast
index d56d96a..3251eb9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_01.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.ast
index 0177ea7..33b62fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_02.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.ast
index 9ff02e1..d1ad335 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_03.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.ast
index 140fd9e..e5e5ede 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_04.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.ast
index 83a2300..bae97e0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_05.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.ast
index c2f61b6..7b4a13e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-composite-key-prefix-join_06.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.ast
index 7542c35..539f40c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multiindex.ast
@@ -92,12 +92,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.ast
index b5fcf3a..792dd39 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join-multipred.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.ast
index 3bac0fc..d117639 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_01.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.ast
index 1f68a9c..52db2ae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_02.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.ast
index 30739ca..71f0566 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_03.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.ast
index 7dd5c8b..7ad29ff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_04.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.ast
index 38bbdb5..119bcdd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index-join/secondary-equi-join_05.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-33.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-33.ast
index 11db30e..6fe409a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-33.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-33.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-34.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-34.ast
index d35819c..d713e3e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-34.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-34.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-35.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-35.ast
index 108b1cb..36585a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-35.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-35.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-36.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-36.ast
index 0cade11..ec925fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-36.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-36.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-37.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-37.ast
index 3649104..bd0f788 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-37.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-37.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-38.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-38.ast
index 2201b8c..a7c9d31 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-38.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-38.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-39.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-39.ast
index 1f4a88c..1ea13a9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-39.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-39.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-40.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-40.ast
index 903b754..9e08bf5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-40.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-40.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-41.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-41.ast
index 86feaf4..88fee61 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-41.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-41.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-42.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-42.ast
index ef94a6f..73e7d85 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-42.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-42.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-43.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-43.ast
index d4a7555..920cbc4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-43.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-43.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-44.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-44.ast
index ce07caf1..84a9e4b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-44.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-44.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-45.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-45.ast
index 225bf81..06e5dde 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-45.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-45.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-46.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-46.ast
index d6dde70..bf628c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-46.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-46.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-47.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-47.ast
index 80accb3..b6e8e1a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-47.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-47.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-48.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-48.ast
index 5db107b..bd25bae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-48.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-48.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-49.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-49.ast
index d1a6277..2475787 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-49.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-49.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-50.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-50.ast
index ba74592..7bd6b2b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-50.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-50.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-51.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-51.ast
index fb67ea6..befdc77 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-51.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-51.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-52.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-52.ast
index 453342c..886b550 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-52.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-52.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-53.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-53.ast
index 65ad8b2..3aac5db 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-53.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-53.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-54.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-54.ast
index 94ae299..9cae370 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-54.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-54.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-55.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-55.ast
index cc20882..b7c0451 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-55.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-55.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-56.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-56.ast
index b1368f1..246df32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-56.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-56.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-57.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-57.ast
index 486d03e..202baeb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-57.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-57.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-58.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-58.ast
index 38e37da..6404d35 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-58.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-58.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-59.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-59.ast
index 82962fd..48d8408 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-59.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-59.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-60.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-60.ast
index 2006e34..0bc9703 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-60.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-60.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-61.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-61.ast
index 7f11abe..bce7a46 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-61.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-61.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-62.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-62.ast
index e8f76d8..d7bee8c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-62.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-62.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-63.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-63.ast
index c1b71fc..65421f5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-63.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/btree-index/btree-secondary-63.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast
index 3a05c3a..0aeb858 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains-panic.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast
index ca99934..ddd8692 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-contains.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
index 17abb95..342f655 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast
index 20f6090..bd5f39f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-check.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast
index 0d245d2..ec970fa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast
index e85c8a1..08e9b3e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-edit-distance.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
index 5731795..09473e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
@@ -20,7 +20,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index 840a28a..7d91d4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -21,7 +21,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast
index c94a207..e4215c8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard-check.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast
index 7645cdd..5077ad4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/ngram-jaccard.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast
index dc2ad53..0cf5f6f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-contains.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
index 1298c33..be845fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -20,7 +20,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast
index 5657988..06a9a7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard-check.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast
index 1c971d2..26a0357 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-basic/word-jaccard.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index 01302aa..7a2df8b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index c71ee06..909c53d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 252ae0e..d826e4f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast
index 0aafd74..42a0a55 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
index 2168572..fa223cf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -41,7 +41,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index 352250b..7db087c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -41,7 +41,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast
index d53658d..3236ab4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -19,7 +19,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index 9129345..91e8b14 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -30,7 +30,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast
index 74de8aa..d0ac329 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-let.ast
@@ -18,7 +18,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast
index 28b074f..c3f5c37 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -29,7 +29,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index a043819..2afec7d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -89,7 +89,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -152,7 +152,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast
index 0978f7a..bb5cfbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_01.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast
index 8ec966a..cd414f6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_02.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast
index eaeb6fb..bcc55a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_03.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast
index 1546710..c16f2f8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-contains_04.ast
@@ -38,12 +38,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast
index 3d47cf7..5f509e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast
index e8e6c66..3890603 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_02.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast
index b055a6b..bad6f23 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_03.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast
index 76ce6b3..5ece0d4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_04.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast
index 76ce6b3..5ece0d4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-check_05.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast
index 0f2bbe8..8b6bafe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-contains.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast
index d2dec49..b350d9f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance-inline.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast
index 5f3a3b0..ddbcf5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_01.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast
index f19ecbc..68a788b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_02.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast
index 1358e20..745d293 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_03.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast
index e7816e8..8377d5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_04.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast
index e7816e8..8377d5a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-edit-distance_05.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
index ba09046..a660c30 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
index fd8370e..6fda9e6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
index fd5699f..4328a07 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
@@ -31,12 +31,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast
index 98a8e6c..c4035b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast
index 98a8e6c..c4035b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index ef1b75b..f5ef0f3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
index e4e38cc..e0faa58 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
index ddd0a62..56d0a08 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
@@ -32,12 +32,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
index 7ec15b8..438838b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast
index aa8ccd5..d8aeeed 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast
index 1aec1d1..7ce3742 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_02.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast
index 70540c5..4df5c46 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_03.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast
index f0ddb9d..64e84c5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-check_04.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast
index bf2e6f1..de20c32 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard-inline.ast
@@ -47,12 +47,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast
index 00550b6..e336afa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_01.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast
index e63e074..328ff03 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_02.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast
index 39f0cc7..d67d91e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_03.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast
index d431177..94156d8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/ngram-jaccard_04.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index ea12577..5e44275 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index 3dfa660..ffbece0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index f48d204..05327ff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -31,12 +31,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast
index c2ee58e..6b2905d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-fuzzyeq-jaccard_04.ast
@@ -45,12 +45,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 56fe48d..936e48d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -63,12 +63,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast
index 8f752dc..34f4b56 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_01.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast
index 2f786a7..b52629f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_02.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast
index 2f577bb..2a460d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_03.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast
index 4a3c467..0fc9d30 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-check_04.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast
index 4d211e9..cea66a3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard-inline.ast
@@ -46,12 +46,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast
index 1471a9a..0c218ce 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_01.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast
index dddfb60..2472579 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_02.ast
@@ -44,12 +44,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast
index f6cdec4..fe9b9a0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_03.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast
index 3e8a0e5..810cd6a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/inverted-index-join/word-jaccard_04.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index eb46bd3..5fdb87e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -83,7 +83,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -110,7 +110,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 83da15f..3e0de3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -83,7 +83,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -133,7 +133,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast
index 50b50a6..eacc2a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast
index 9e68e92..df43291 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast
index 9f2f3e5..5fe1c64 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_03.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast
index b636b9a..d1d5137 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast
index b636b9a..d1d5137 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested-open-index/rtree-index-join/spatial-intersect-point_05.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj2.ast
index 7bb0caf..c3aa5d7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj2.ast
@@ -63,7 +63,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
@@ -85,7 +85,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -96,7 +96,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj3.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj3.ast
index 6a854a2..89687b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj3.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/nested_loj3.ast
@@ -73,7 +73,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
@@ -95,7 +95,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -117,7 +117,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$l ]
@@ -128,7 +128,7 @@
SELECT ELEMENT [
Variable [ Name=$ps ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [PartSupp]
]
AS Variable [ Name=$ps ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.ast
index d1e9759..7e75202 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/disjunction-to-join.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
index 76a2e5b..16ff666 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_1.ast
@@ -66,7 +66,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -94,7 +94,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
index d6114a0..a859a48 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_01_2.ast
@@ -65,7 +65,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -93,7 +93,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
index d28aff9..338c006 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_1.ast
@@ -66,7 +66,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -108,7 +108,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
index 7726a83..503104a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/leftouterjoin-probe-pidx-with-join-btree-sidx_02_2.ast
@@ -65,7 +65,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -107,7 +107,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.ast
index d8d958b..ca8d08a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_01.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.ast
index d024ed2..14e6147 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_02.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.ast
index 3af7cb3..4263b80 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-join_03.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.ast
index 6b802b3..5abb0aa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_01.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.ast
index 92afdbb..d443f26 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_02.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.ast
index 203c2b2..028dc1d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_03.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.ast
index e4852e4..a511b14 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_04.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.ast
index 9a23b2e..ae39d44 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_05.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.ast
index 3f69e31..95959df 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-composite-key-prefix-join_06.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Names]
]
AS Variable [ Name=$emp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.ast
index f47ee04..f478e7b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multiindex.ast
@@ -70,12 +70,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.ast
index 571ec36..563bc35 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join-multipred.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.ast
index d00a4a1..ca7223f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.ast
index 498ef47..6510bdc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.ast
index c115997..8ba9284 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_03.ast
@@ -24,12 +24,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.ast
index e60fa3b..341c9fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.ast
index e60fa3b..341c9fc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index-join/secondary-equi-join_05.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-33.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-33.ast
index 5c5d52d..5628af0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-33.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-33.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-34.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-34.ast
index 58afd51..3400f89 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-34.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-34.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-35.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-35.ast
index 24ebd22..084e997 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-35.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-35.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-36.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-36.ast
index b5e0af7..f5e0f6c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-36.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-36.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-37.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-37.ast
index 6deb867..d29c178 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-37.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-37.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-38.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-38.ast
index 4902e4c..ac60ae2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-38.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-38.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-39.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-39.ast
index e6443cc..cef097b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-39.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-39.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-40.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-40.ast
index 989bfcd..864f43f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-40.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-40.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-41.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-41.ast
index d165715..df6c87a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-41.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-41.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-42.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-42.ast
index 603d004..a7ee0a1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-42.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-42.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-43.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-43.ast
index cd1ebb4..1ed671b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-43.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-43.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-44.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-44.ast
index b6fb2de..4964f56 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-44.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-44.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-45.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-45.ast
index 178de05..6eb478a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-45.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-45.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-46.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-46.ast
index 45a4915..c74cd01 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-46.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-46.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-47.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-47.ast
index 8f34a91..52fa383 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-47.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-47.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-48.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-48.ast
index a7f9e37..f86b2c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-48.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-48.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-49.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-49.ast
index 32027ab..6521663 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-49.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-49.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-50.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-50.ast
index 823782f..9cbd63e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-50.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-50.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-51.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-51.ast
index 9cbb534..6997f94 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-51.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-51.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-52.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-52.ast
index 7136788..360c659 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-52.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-52.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-53.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-53.ast
index 2501fc5..6813881 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-53.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-53.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-54.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-54.ast
index 1d87d65..1f54f6d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-54.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-54.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-55.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-55.ast
index 79ea3c2..beb7947 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-55.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-55.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-56.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-56.ast
index 9f22978..c435d4c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-56.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-56.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-57.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-57.ast
index 6264ffd..f166878 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-57.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-57.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-58.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-58.ast
index b7b30f9..83ab656 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-58.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-58.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-59.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-59.ast
index 26dce99..7835b3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-59.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-59.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-60.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-60.ast
index eb13302..d004e1e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-60.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-60.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-61.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-61.ast
index 89aef71..c62cdc4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-61.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-61.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-62.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-62.ast
index 4945e13..9554de1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-62.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-62.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-63.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-63.ast
index 26fbde9..7f3ae03 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-63.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/btree-index/btree-secondary-63.ast
@@ -10,7 +10,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast
index 6dc93c7..a79edc5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains-panic.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast
index b759757..995d147 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-contains.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast
index fd2ba6d..20e3474 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check-panic.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast
index 5f2a1d7..ea122be 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-check.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast
index 15d9fd0..9a39a3a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance-panic.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast
index 2914df1..1a4a8d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-edit-distance.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
index be959ce..f0d85ea 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-edit-distance.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
index 79dcbed..b956167 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-fuzzyeq-jaccard.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast
index 7b4ccc7..2d59ea5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard-check.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast
index d22410d..5918c39 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/ngram-jaccard.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast
index 909177c..cf34c2e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-contains.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast
index add3101..7bd1ce3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-fuzzyeq-jaccard.ast
@@ -15,7 +15,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast
index 43fa817..2ea4f6b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard-check.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast
index 1563de3..f62bb90 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-basic/word-jaccard.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
index e340987..6fb470c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_01.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
index 31d8798..aef7f4e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic-nopanic_02.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
index 69839b2..ec88a77 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let-panic.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast
index 616db27..c7cd0bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-let.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast
index cd46656..2e4ea74 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-substring.ast
@@ -30,7 +30,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
index 23b15c0..cfadcf3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-edit-distance-check-word-tokens.ast
@@ -30,7 +30,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast
index 299760f..e47dfa2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-let.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast
index 6887742..3b206d3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/ngram-jaccard-check-multi-let.ast
@@ -25,7 +25,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast
index 2238bf4..6ce05d1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-let.ast
@@ -13,7 +13,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast
index 1e64350..fbeb39b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-complex/word-jaccard-check-multi-let.ast
@@ -24,7 +24,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
index 553171d..99bd566 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/leftouterjoin-probe-pidx-with-join-edit-distance-check-idx_01.ast
@@ -72,7 +72,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -120,7 +120,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast
index 0978f7a..bb5cfbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_01.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast
index 43ed1f3..3dbc207 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_02.ast
@@ -39,12 +39,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast
index eaeb6fb..bcc55a2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_03.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast
index 1546710..c16f2f8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-contains_04.ast
@@ -38,12 +38,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast
index a995990..2f6bafa 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast
index 0bb3c18..8d6ddaf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast
index b838f8a..f4e2eb4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_03.ast
@@ -24,12 +24,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast
index cb96703..7f55269 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast
index cb96703..7f55269 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_05.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast
index 78c5abe..285b671 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-check_inline_03.ast
@@ -32,12 +32,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast
index 73a9b12..ff25932 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance-contains.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast
index 0da1348..9b31d98 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast
index bf359d3..f9ddbc8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast
index f672f4c..cd64087 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_03.ast
@@ -24,12 +24,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast
index 596a0e8..635bfbe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast
index 596a0e8..635bfbe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_05.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast
index e350538..4dbb9b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-edit-distance_inline_03.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
index 865b0ce..8ed62b3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_01.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
index 14f1722..4fa7b7d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_02.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
index 01718f2..0e3bf24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_03.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast
index 4bac0fe..d880153 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_04.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast
index 4bac0fe..d880153 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-edit-distance_05.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
index d847ed7..9d5012a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_01.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
index d575cd9..9f9a993 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_02.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
index f6529e3..00110f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_03.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
index 2393e0d..1d2907d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-fuzzyeq-jaccard_04.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
index dfc5806..da5cdd3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
index 17b5d69..4d91b35 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
index 0d988a9..a87dd15 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
index 0063692..7b2bbab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_04.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
index a7f8c69..cdc30b8 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard-check_inline_03.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
index 2c470d0..60df3d9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_01.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
index 4eaed02..f838a35 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_02.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
index 85c0135..a10d767 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_03.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
index bfd6fa9..fac9c78 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_04.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
index 336e8b6..43e144d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/ngram-jaccard_inline_03.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
index 5b9fd80..a8162cd 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_01.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
index 54dc66e..ed475f38 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_02.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
index c88e567..2b0da51 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_03.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
index 31a2d5d..5aa2c57 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-fuzzyeq-jaccard_04.ast
@@ -35,12 +35,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
index 15be700..3c349ee 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check-after-btree-access.ast
@@ -52,12 +52,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
index c7b47c7..02e8984 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
index a62d8da..0fb7d9b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
index 2052511..63f21f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_03.ast
@@ -24,12 +24,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
index cb55ef9..a3044f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
index 7030392..c883f22 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard-check_inline_03.ast
@@ -32,12 +32,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
index 2cbe046..5da923d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_01.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
index ee010a7..714ce10 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_02.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
index c6f2392..46a2f3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_03.ast
@@ -24,12 +24,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
index b35e9db..06628e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_04.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
index e7c6029..81e1b45 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/inverted-index-join/word-jaccard_inline_03.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index c86b6fc..589d91a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -66,7 +66,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -90,7 +90,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index e8b41fb..cc7ccf4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -66,7 +66,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -104,7 +104,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
index 5217c93..18a9687 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_01.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
index 0472b4b..f6cccae 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_02.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
index b8f0de2..783875ec 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_03.ast
@@ -27,12 +27,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
index b3a61a3..71ce99f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_04.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
index b3a61a3..71ce99f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/open-index-enforced/rtree-index-join/spatial-intersect-point_05.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast
index 5c200bb..1984dbf 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orderby-desc-using-gby.ast
@@ -32,7 +32,7 @@
(
LiteralExpr [STRING] [age]
:
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [age]
Variable [ Name=$name ]
Variable [ Name=#1 ]
@@ -40,7 +40,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
@@ -60,7 +60,7 @@
Orderby
Variable [ Name=$name ]
DESC
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [age]
Variable [ Name=$name ]
Variable [ Name=#1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
index f2c8872..213d7ef 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-aggreg.ast
@@ -23,7 +23,7 @@
LiteralExpr [STRING] [ordpercust]
:
FunctionCall asterix.count@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o]
Variable [ Name=$cid ]
Variable [ Name=#1 ]
@@ -41,7 +41,7 @@
Field=total
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [o]
]
AS Variable [ Name=$i ]
@@ -60,7 +60,7 @@
Field=total
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [o]
]
AS Variable [ Name=$i ]
@@ -70,7 +70,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
index 96a4bc9..27f29ea 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-composite-index-search.ast
@@ -43,7 +43,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
index dd0c4ea..c54b4ff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_01.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
index 97b43b2..62c3b98 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive-open_02.ast
@@ -43,7 +43,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
index 2cc53a8..8061fa1 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_01.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
index 3609c78..5f85c9c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-conjunctive_02.ast
@@ -43,7 +43,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
index 9222a7e..f1d0bb3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search-open.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
index 5f4d438..5669381 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/orders-index-search.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
index bd7c74c..8c3e9b6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search-open.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
index da4c90b..0d710cc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/prim-idx-search.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
index 7b5ac60..f2cc44d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/pull_select_above_eq_join.ast
@@ -41,12 +41,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Visitors]
]
AS Variable [ Name=$visitor ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
index 6bb15c8..59f4343 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push-project-through-group.ast
@@ -28,7 +28,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -42,7 +42,7 @@
Field=title
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
index 833d67f..9a5b369 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/push_limit.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
index 5e220fd..2ea4576 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q01_pricing_summary_report_nt.ast
@@ -45,7 +45,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -64,7 +64,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -94,7 +94,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -133,7 +133,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -152,7 +152,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -171,7 +171,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -190,7 +190,7 @@
Field=l_discount
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -202,7 +202,7 @@
LiteralExpr [STRING] [count_order]
:
FunctionCall asterix.count@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$l_linestatus ]
Variable [ Name=$l_returnflag ]
@@ -212,7 +212,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
index 35a0f59..0e6b737 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q03_shipping_priority.ast
@@ -73,17 +73,17 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$l ]
@@ -192,7 +192,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
index 6795260..dc30334 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q05_local_supplier_volume.ast
@@ -92,7 +92,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
@@ -142,7 +142,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -192,7 +192,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItems]
]
AS Variable [ Name=$l ]
@@ -226,7 +226,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Suppliers]
]
AS Variable [ Name=$s ]
@@ -252,12 +252,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nations]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Regions]
]
AS Variable [ Name=$r ]
@@ -413,7 +413,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [o1]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
index b50fc64..ea98997 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q08_group_by.ast
@@ -135,7 +135,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -222,7 +222,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -248,7 +248,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -266,7 +266,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -284,12 +284,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Region]
]
AS Variable [ Name=$r1 ]
@@ -385,7 +385,7 @@
)
AS Variable [ Name=$lnrco ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
index 37fecbd..b5de7f7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q09_group_by.ast
@@ -153,7 +153,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -219,7 +219,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -306,12 +306,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -331,7 +331,7 @@
)
AS Variable [ Name=$s1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast
index 899be1a..08095e2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q1.ast
@@ -38,7 +38,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
index cfeb5fc..d11b11c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/q2.ast
@@ -51,7 +51,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Event]
]
AS Variable [ Name=$event ]
@@ -94,7 +94,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [es]
Variable [ Name=$sponsor ]
Variable [ Name=$event ]
@@ -137,7 +137,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [es]
]
AS Variable [ Name=$e ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
index 38c25da..042bd3d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue550.ast
@@ -161,7 +161,7 @@
SELECT ELEMENT [
Variable [ Name=$srec ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [s]
]
AS Variable [ Name=$srec ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
index d8f328a..f73b58d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue562.ast
@@ -144,7 +144,7 @@
Field=c_acctbal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -227,7 +227,7 @@
LiteralExpr [STRING] [numcust]
:
FunctionCall asterix.count@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [ct]
Variable [ Name=$cntrycode ]
Variable [ Name=#1 ]
@@ -245,7 +245,7 @@
Field=c_acctbal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [ct]
]
AS Variable [ Name=$i ]
@@ -266,7 +266,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
index 3f3558d..10a5a24 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue601.ast
@@ -47,7 +47,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
index b106711..8e521e3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue697.ast
@@ -25,14 +25,14 @@
Field=value
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [i]
]
AS Variable [ Name=$j ]
]
Where
- FunctionCall null.not@1[
- FunctionCall null.is-null@1[
+ FunctionCall algebricks.not@1[
+ FunctionCall algebricks.is-null@1[
FieldAccessor [
Variable [ Name=$j ]
Field=value
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
index c383a04..a265c87 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue785.ast
@@ -80,12 +80,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
@@ -128,12 +128,12 @@
FROM [ Variable [ Name=$t ]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
@@ -194,7 +194,7 @@
Field=o_totalprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [orders]
]
AS Variable [ Name=$o ]
@@ -233,7 +233,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [x]
]
AS Variable [ Name=$y ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
index 90336e2..03e82c0 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810-2.ast
@@ -63,7 +63,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -104,7 +104,7 @@
Field=l_discount
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -125,7 +125,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -169,7 +169,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
@@ -195,7 +195,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
index 65d64bc..c49e97a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue810.ast
@@ -49,7 +49,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -87,7 +87,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$m ]
@@ -108,7 +108,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [l]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
index 50efae7..e4cb012 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query-issue827-2.ast
@@ -33,7 +33,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -61,7 +61,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -91,7 +91,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -130,7 +130,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -149,7 +149,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -177,7 +177,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -196,7 +196,7 @@
Field=l_discount
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -212,7 +212,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
index 6150c74..441fc1c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849-2.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [s]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
index b83b445e..cf3ab3a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/query_issue849.ast
@@ -45,7 +45,7 @@
Field=b
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [s]
]
AS Variable [ Name=$z ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
index 4ac7aa6..94abf95 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric-desc.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
index f0c9b9b..e849f7f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-numeric.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
index e3e358e..8d6cda5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string-desc.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
index d0f4e62..d25a2e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/range-connector/sort-hint-on-closed-string.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
index 8bef230..9b55499 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/issue730.ast
@@ -43,7 +43,7 @@
Field=tweetid
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -60,7 +60,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
index 3ad79eb..3de95b9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_01.ast
@@ -67,7 +67,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
index 2fa343b..fc092bb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/leftouterjoin-probe-pidx-with-join-rtree-sidx_02.ast
@@ -67,7 +67,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -105,7 +105,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
index 7c28623..52aa967 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/query-issue838.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetHistorySubscriptions]
]
AS Variable [ Name=$sub ]
@@ -53,7 +53,7 @@
SELECT ELEMENT [
Variable [ Name=$tweet ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$tweet ]
@@ -61,7 +61,7 @@
Let Variable [ Name=$circle ]
:=
FunctionCall twitter.create-circle@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [location]
Variable [ Name=$tweet ]
Variable [ Name=$sub ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
index ffa9ba7..32daead 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_01.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
index 5bbcf02..87e2f67 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_02.ast
@@ -29,12 +29,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
index a3a67e3..c64b67c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-index-join/spatial-intersect-point_03.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
index 415c1f4..0953bd2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index-open.ast
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
index e5c689e..2f722f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/rtree-secondary-index.ast
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
index 9f0b05a..51a51de 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_01.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
index bd009ea..ff684c2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_02.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
index e00d123..5340bc7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_03.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
index 8503fc0..388fd9c 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_04.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
index 091ac0b..6465047 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_05.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
index 1fc15b9..5c4e6d5 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_06.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
index 210c5f8..19f57ff 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_07.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
index dde6594..5389667 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-let-to-edit-distance-check_08.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$ed ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
index 23e9f94..9bf58fe 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_01.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
index 3ea6c39..5cb4a78 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_02.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
index f3e6664..d99a51a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_03.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
index 33896a8..201e178 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_04.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
index a2339f8..8f43cc7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_05.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
index 64c9e36..b3612e7 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_06.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
index c80aa6c..c38e51d 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_07.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
index 8c146c9..2d3ba56 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/edit-distance-to-edit-distance-check_08.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
index 41f2380..cb5c992 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-edit-distance-check.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
index 3c06584..4da8b12 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/fuzzyeq-to-jaccard-check.ast
@@ -16,7 +16,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
index 83f7572..b3ebf66 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_01.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
index 9252d55..6ab82f2 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_02.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
index c3f6a91..997ef95 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_03.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
index ab9edef..f41149b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_04.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
index 60fccc6..d25cbb6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_05.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
index d4c181d..c84e0ab 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_06.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
index 6efb812..2e7bb43 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_07.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
index ffdc437..f6648fb 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-let-to-jaccard-check_08.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$jacc ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
index 024623d..f0a0d61 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_01.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
index 433eae6..738588b 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_02.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
index 97314fe..fcd9dfc 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_03.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
index 621a9f0..68c3df3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_04.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
index 4ea0e01..f8b7d6f 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_05.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
index e94c845..59c3090 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_06.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
index 0741d5c..cd6497a 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_07.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
index 5914745..48f67f3 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/similarity/jaccard-to-jaccard-check_08.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast
index a83918f..5396d58 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/dont-skip-primary-index.ast
@@ -11,7 +11,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
index 4647d35..cc5ec5e 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-ngram-index.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
index e5c689e..2f722f9 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-rtree-secondary-index.ast
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
index 4c8f681..5c196d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index-2.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
index 4c8f681..5c196d6 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-secondary-btree-index.ast
@@ -12,7 +12,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
index c76c66b..8a99e86 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/skip-index/skip-word-index.ast
@@ -14,7 +14,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
index 8e0b8cc..8be66d4 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/sort-cust.ast
@@ -42,7 +42,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
index c5c32c6..70acd67 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization-above-join.ast
@@ -33,12 +33,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
@@ -60,7 +60,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=#5 ]
Variable [ Name=$lenLeft ]
@@ -79,20 +79,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensLeft]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenLeft]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -102,13 +102,13 @@
]
AS Variable [ Name=$prefixTokenLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -116,7 +116,7 @@
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -155,7 +155,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -240,7 +240,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
index 1824e70..f8f2144 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/split-materialization.ast
@@ -26,7 +26,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$d ]
@@ -49,7 +49,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
index 8379b56..cfbed28 100644
--- a/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
+++ b/asterixdb/asterix-app/src/test/resources/optimizerts/results_parser_sqlpp/unnest_list_in_subplan.ast
@@ -32,7 +32,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -63,7 +63,7 @@
FROM [ Variable [ Name=$tokensUnrankedDBLP ]
AS Variable [ Name=$tokenUnranked ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TOKENSRANKEDADM]
]
AS Variable [ Name=$tokenRanked ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
index 807e7a7..f26febf 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/1.ast
@@ -11,7 +11,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
index 0ee0fbd..9175953 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/2.ast
@@ -18,7 +18,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Event]
]
AS Variable [ Name=$event ]
@@ -61,7 +61,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [es]
Variable [ Name=$sponsor ]
Variable [ Name=$event ]
@@ -91,7 +91,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [es]
Variable [ Name=#4 ]
Variable [ Name=$sponsor ]
@@ -111,7 +111,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [es]
]
AS Variable [ Name=$e ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
index f7272c5..9599255 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/4.ast
@@ -8,7 +8,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SIGroup]
]
AS Variable [ Name=$sig ]
@@ -28,7 +28,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SIGroup]
]
AS Variable [ Name=$similar_sig ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
index 0fd42ae..9eb7cf8 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/5.ast
@@ -8,7 +8,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Event]
]
AS Variable [ Name=$event ]
@@ -28,7 +28,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Events]
]
AS Variable [ Name=$collocated_event ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
index 0fb00ff..854c7d1 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/6.ast
@@ -16,7 +16,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$user ]
@@ -41,7 +41,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$similar_user ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
index 063e698..42e81f9 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/ANYInFieldAccessor.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Movie]
]
AS Variable [ Name=$mv ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
index 5211b72..5adaa1e 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/LetFor.ast
@@ -1,7 +1,7 @@
Query:
Let Variable [ Name=$users ]
:=
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [User]
]
SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
index aadad7e..3bcc2ab 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias.ast
@@ -3,7 +3,7 @@
FunctionCall null.sqrt@1[
OperatorExpr [
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$u ]
Variable [ Name=$root ]
@@ -13,7 +13,7 @@
]
*
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$u ]
Variable [ Name=$root ]
@@ -25,7 +25,7 @@
]
root
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tbl_name]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
index 9cf8d6f..1ffd234 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias2.ast
@@ -3,7 +3,7 @@
FunctionCall null.sqrt@1[
OperatorExpr [
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$u ]
Variable [ Name=#1 ]
@@ -13,7 +13,7 @@
]
*
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$u ]
Variable [ Name=#1 ]
@@ -25,7 +25,7 @@
]
root
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tbl_name]
]
AS Variable [ Name=$root ]
@@ -45,7 +45,7 @@
Let Variable [ Name=$u ]
:=
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [root]
Variable [ Name=#1 ]
Variable [ Name=$id ]
@@ -55,7 +55,7 @@
HAVING
OperatorExpr [
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [root]
Variable [ Name=$u ]
Variable [ Name=#1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
index 92fcd53..83a3894 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/columnalias3.ast
@@ -7,7 +7,7 @@
FunctionCall null.sqrt@1[
OperatorExpr [
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$u ]
Variable [ Name=$root ]
@@ -17,7 +17,7 @@
]
*
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$u ]
Variable [ Name=$root ]
@@ -30,7 +30,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tbl_name]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
index 26a623b..5107239 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_correlate.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$r ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [sensors]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
index 5f5e37f..02032d6 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_flatten.ast
@@ -9,7 +9,7 @@
Variable [ Name=$r ]
reading
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [sensors]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
index 9d28bd0..6d73832 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/from_inner_join.ast
@@ -17,12 +17,12 @@
]
location
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [sensors]
]
AS Variable [ Name=$s ]
INNER JOIN
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [sensorMeta]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
index b14e49b..3df40fc 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/functionDecl1.ast
@@ -102,7 +102,7 @@
Let Variable [ Name=$result ]
:=
FunctionCall null.calculate@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [Events]
]
]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
index aa422a1..695e4c6 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR.ast
@@ -14,7 +14,7 @@
FROM [ (
Let Variable [ Name=$data ]
:=
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [User]
]
SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
index 60f5465..463ddc4 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR2.ast
@@ -34,7 +34,7 @@
SELECT ELEMENT [
Variable [ Name=$tmp ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [number]
]
AS Variable [ Name=$tmp ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
index f9be2c5..927c7f8 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFLWOGR3.ast
@@ -18,7 +18,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Event]
]
AS Variable [ Name=$event ]
@@ -61,7 +61,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [es]
Variable [ Name=$sponsor ]
Variable [ Name=$event ]
@@ -91,7 +91,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [es]
Variable [ Name=#4 ]
Variable [ Name=$sponsor ]
@@ -111,7 +111,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [es]
]
AS Variable [ Name=$e ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
index da1252e..52a9319 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/nestedFor.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Movie]
]
AS Variable [ Name=$mv ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
index ef6707f..605113f 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/numberInFieldAccessor.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Movie]
]
AS Variable [ Name=$mv ]
diff --git a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
index 4ada26d..57ce127 100644
--- a/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
+++ b/asterixdb/asterix-app/src/test/resources/parserts/results_parser_sqlpp/where_clause.ast
@@ -6,7 +6,7 @@
Field=reading
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [sensors]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-autogenerated-no-field/load-with-autogenerated-no-field.1.ddl.aql
similarity index 72%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-autogenerated-no-field/load-with-autogenerated-no-field.1.ddl.aql
index 7a17743..a0764a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries/dml/load-with-autogenerated-no-field/load-with-autogenerated-no-field.1.ddl.aql
@@ -16,15 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
+// try to create autogenerated key on field not mentioned in type, should fail
+
+drop dataverse test if exists;
+create dataverse test;
use dataverse test;
-for $a in dataset('t1')
-where $a.unique1 > 10 and $a.stringu1="DGAAAAXXXXXXXXXXXXXXXXXXX"
-return $a
+create type DBLPType as open {
+ id: uuid,
+ dblpid: string,
+ title: string,
+ authors: string,
+ misc: string
+}
+
+create dataset DBLP(DBLPType) primary key not_id autogenerated;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql
deleted file mode 100644
index 3d529fb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type LineItemType as closed {
- l_orderkey: int64,
- l_partkey: int64,
- l_suppkey: int64,
- l_linenumber: int64,
- l_quantity: int64,
- l_extendedprice: double,
- l_discount: double,
- l_tax: double,
- l_returnflag: string,
- l_linestatus: string,
- l_shipdate: string,
- l_commitdate: string,
- l_receiptdate: string,
- l_shipinstruct: string,
- l_shipmode: string,
- l_comment: string
-}
-
-create temporary dataset LineItem(LineItemType)
- primary key l_orderkey, l_linenumber;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql
deleted file mode 100644
index bc2b6ee..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-load dataset LineItem
-using localfs
-(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql
deleted file mode 100644
index 496ce13..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-create index idx_LineItem_partkey on LineItem(l_linenumber);
-create index idx_LineItem_suppkey on LineItem(l_suppkey);
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql
deleted file mode 100644
index edc4af6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-delete $l from dataset LineItem where $l.l_suppkey>=2 or $l.l_linenumber>1;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql
deleted file mode 100644
index 88d4a86..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-for $c in dataset('LineItem')
-where $c.l_suppkey<150
-order by $c.l_orderkey, $c.l_linenumber
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql
deleted file mode 100644
index 7cf6796..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type LineItemType as closed {
- l_orderkey: int64,
- l_partkey: int64,
- l_suppkey: int64,
- l_linenumber: int64,
- l_quantity: int64,
- l_extendedprice: double,
- l_discount: double,
- l_tax: double,
- l_returnflag: string,
- l_linestatus: string,
- l_shipdate: string,
- l_commitdate: string,
- l_receiptdate: string,
- l_shipinstruct: string,
- l_shipmode: string,
- l_comment: string
-}
-
-create temporary dataset LineItem(LineItemType)
- primary key l_orderkey, l_linenumber;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql
deleted file mode 100644
index e6b98c7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-load dataset LineItem
-using localfs
-(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-delete $l from dataset LineItem where $l.l_orderkey>=10;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql
deleted file mode 100644
index c88cf8c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-for $c in dataset('LineItem')
-order by $c.l_orderkey, $c.l_linenumber
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql
deleted file mode 100644
index 3b6c965..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.aql
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-create type Name as open {
-first : string,
-last : string
-}
-
-create type Person as open {
-name : Name
-}
-
-create type TestType as open {
-id : int32,
-name : string,
-locn : point,
-zip : string,
-person : Person
-}
-
-create temporary dataset t1(TestType) primary key id;
-
-create index rtree_index_point on t1(locn) type rtree;
-
-create index rtree_index_point_open on t1(open_locn:point?) type rtree enforced;
-
-create index keyWD_indx on t1(name) type keyword;
-
-create index keyWD_indx_open on t1(nickname:string?) type keyword enforced;
-
-create index secndIndx on t1(zip);
-
-create index nested on t1(person.name.first);
-
-create index secndIndx_open on t1(address:string?) enforced;
-
-drop index t1.rtree_index_point;
-
-drop index t1.rtree_index_point_open;
-
-drop index t1.keyWD_indx;
-
-drop index t1.keyWD_indx_open;
-
-drop index t1.secndIndx;
-
-drop index t1.nested;
-
-drop index t1.secndIndx_open;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql
deleted file mode 100644
index ebe3e6a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.aql
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql
deleted file mode 100644
index 61f4309..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-for $l in dataset('Metadata.Index')
-where $l.IsPrimary=false and $l.DataverseName='test'
-return $l;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql
deleted file mode 100644
index 887b004a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.1.ddl.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type Schema as closed {
-unique1: int64,
-unique2: int64,
-two: int64,
-four: int64,
-ten: int64,
-twenty: int64,
-onePercent: int64,
-tenPercent: int64,
-twentyPercent: int64,
-fiftyPercent: int64,
-unique3: int64,
-evenOnePercent: int64,
-oddOnePercent: int64,
-stringu1: string,
-stringu2: string,
-string4: string
-}
-
-create temporary dataset t1(Schema) primary key unique2;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql
deleted file mode 100644
index bf556a0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.2.update.aql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-// Load data
-load dataset t1
-using localfs
-(("path"="asterix_nc1://data/wisc/onektup.adm"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql
deleted file mode 100644
index a66a9e5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.3.ddl.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use dataverse test;
-
-// create secondary indexes
-create index idx_t1_str1 on t1(stringu1);
-create index idx_t1_unique1 on t1(unique1);
-
-// drop secondary indexes
-drop index t1.idx_t1_str1;
-drop index t1.idx_t1_unique1;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql
deleted file mode 100644
index d1f5a7a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.aql
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Load a temporary dataset with previously created empty indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type LineItemType as closed {
- l_orderkey: int64,
- l_partkey: int64,
- l_suppkey: int64,
- l_linenumber: int64,
- l_quantity: double,
- l_extendedprice: double,
- l_discount: double,
- l_tax: double,
- l_returnflag: string,
- l_linestatus: string,
- l_shipdate: string,
- l_commitdate: string,
- l_receiptdate: string,
- l_shipinstruct: string,
- l_shipmode: string,
- l_comment: string
-}
-
-create temporary dataset LineItem(LineItemType)
- primary key l_orderkey, l_linenumber;
-
-create index part_index on LineItem(l_partkey);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql
deleted file mode 100644
index 7223583..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Load a temporary dataset with previously created empty indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-load dataset LineItem
-using localfs
-(("path"="asterix_nc1://data/empty.adm"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
-load dataset LineItem
-using localfs
-(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.3.query.aql
deleted file mode 100644
index 04f1679..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/empty-load-with-index/empty-load-with-index.3.query.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Load a temporary dataset with previously created empty indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-for $c in dataset('LineItem')
-order by $c.l_orderkey, $c.l_linenumber
-limit 1
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.aql
deleted file mode 100644
index 6834cde..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.Emp as closed {
-id: int64,
-fname: string,
-lname: string,
-age: int64,
-dept: string
-}
-
-create temporary dataset test.employee(Emp) primary key id
-using compaction policy "correlated-prefix"
-(("max-mergable-component-size"="16384"),("max-tolerance-component-count"="3"));
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.2.update.aql
deleted file mode 100644
index c68a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.2.update.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-use dataverse test;
-
-load dataset test.employee
-using localfs
-(("path"="asterix_nc1://data/names.adm"),("format"="delimited-text"),("delimiter"="|"));
-
-
-insert into dataset test.employee (
-for $x in dataset test.employee
-return {
- "id": $x.id + 10000,
- "fname": $x.fname,
- "lname": $x.lname,
- "age": $x.age,
- "dept": $x.dept
-}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.3.ddl.aql
deleted file mode 100644
index 00b0850..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.3.ddl.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-use dataverse test;
-
-create index idx_employee_first_name on test.employee(fname);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.4.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.4.query.aql
deleted file mode 100644
index 195f11e7..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.4.query.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-use dataverse test;
-
-for $l in dataset('test.employee')
-order by $l.id
-return $l
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.aql
deleted file mode 100644
index e6865e2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.Emp as closed {
-id: int64,
-fname: string,
-lname: string,
-age: int64,
-dept: string
-}
-
-create temporary dataset test.employee(Emp) primary key id;
-
-create index idx_employee_first_name on test.employee(fname);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.aql
deleted file mode 100644
index 5c9e569..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.aql
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 28 2015
- */
-
-use dataverse test;
-
-load dataset test.employee
-using localfs
-(("path"="asterix_nc1://data/names.adm"),("format"="delimited-text"),("delimiter"="|"));
-
-
-insert into dataset test.employee (
-for $x in dataset test.employee
-return {
- "id": $x.id + 10000,
- "fname": $x.fname,
- "lname": $x.lname,
- "age": $x.age,
- "dept": $x.dept
-}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.query.aql
deleted file mode 100644
index 1b15209..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.query.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of dead latch.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-
-use dataverse test;
-
-for $l in dataset('test.employee')
-order by $l.id
-return $l
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.aql
deleted file mode 100644
index 4b17b3e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : July 11 2013
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type myDataType as open {
- id: int64
-}
-
-create temporary dataset myData(myDataType)
- primary key id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.aql
deleted file mode 100644
index c61edcb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.aql
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : insert-and-scan-dataset.aql
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-load dataset myData
-using localfs
-(("path"="asterix_nc1://data/odd-numbers.adm"),("format"="adm"))pre-sorted;
-
-
-insert into dataset myData (
-for $x in dataset myData
-return {
- "id": $x.id + 1
-}
-);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.query.aql
deleted file mode 100644
index 37ceca0..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.query.aql
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : insert-and-scan-dataset.aql
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 27 2015
- *
- */
-
-use dataverse test;
-
-for $c in dataset('myData')
-order by $c.id
-return $c
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.aql
deleted file mode 100644
index 78c0221..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.aql
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Test a read query over a temporary dataset.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use dataverse tpch;
-
-create type LineItemType as closed {
- l_orderkey: int64,
- l_partkey: int64,
- l_suppkey: int64,
- l_linenumber: int64,
- l_quantity: double,
- l_extendedprice: double,
- l_discount: double,
- l_tax: double,
- l_returnflag: string,
- l_linestatus: string,
- l_shipdate: string,
- l_commitdate: string,
- l_receiptdate: string,
- l_shipinstruct: string,
- l_shipmode: string,
- l_comment: string
-}
-
-create temporary dataset LineItem(LineItemType)
- primary key l_orderkey, l_linenumber;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.aql
deleted file mode 100644
index 5a99e55..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Test a read query over a temporary dataset.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse tpch;
-
-load dataset LineItem
-using localfs
-(("path"="asterix_nc1://data/tpch0.001/lineitem.tbl"),("format"="delimited-text"),("delimiter"="|")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.aql
deleted file mode 100644
index 75f6f6a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Test a read query over a temporary dataset.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse tpch;
-set import-private-functions 'true';
-
-for $l in dataset('LineItem')
-where $l.l_shipdate <= '1998-09-02'
-/*+ hash*/
-group by $l_returnflag := $l.l_returnflag,
- $l_linestatus := $l.l_linestatus
- with $l
-order by $l_returnflag, $l_linestatus
-return {
- "l_returnflag": $l_returnflag,
- "l_linestatus": $l_linestatus,
- "sum_qty": sum(for $i in $l return $i.l_quantity),
- "sum_base_price": sum(for $i in $l return $i.l_extendedprice),
- "sum_disc_price": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount)),
- "sum_charge": sum(for $i in $l return $i.l_extendedprice * (1 - $i.l_discount) * (1 + $i.l_tax)),
- "ave_qty": avg(for $i in $l return $i.l_quantity),
- "ave_price": avg(for $i in $l return $i.l_extendedprice),
- "ave_disc": avg(for $i in $l return $i.l_discount),
- "count_order": count($l)
-}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.aql
deleted file mode 100644
index 9bf5118..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ddl.aql
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type MyRecord as closed {
- id: int64,
- point: point,
- kwds: string,
- line1: line,
- line2: line,
- poly1: polygon,
- poly2: polygon,
- rec: rectangle,
- circle: circle
-}
-
-create temporary dataset MyData(MyRecord)
- primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.aql
deleted file mode 100644
index 24d8d3d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ddl.aql
deleted file mode 100644
index 3fff78a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ddl.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-create index rtree_index_point on MyData(point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.aql
deleted file mode 100644
index 2698483..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-delete $m from dataset MyData where $m.id>10;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.query.aql
deleted file mode 100644
index db8d975..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.query.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-for $o in dataset('MyData')
-where spatial-intersect($o.point, create-polygon([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.aql
deleted file mode 100644
index 82430ed..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a persistent dataset into a temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type MyRecord as closed {
- id: int64,
- point: point,
- kwds: string,
- line1: line,
- line2: line,
- poly1: polygon,
- poly2: polygon,
- rec: rectangle,
- circle: circle
-}
-
-create type MyMiniRecord as closed {
- id: int64,
- point: point
-}
-
-create dataset MyData(MyRecord)
- primary key id;
-
-create temporary dataset MyMiniData(MyMiniRecord)
- primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.aql
deleted file mode 100644
index 8fffba1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-load dataset MyMiniData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData0.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ddl.aql
deleted file mode 100644
index 6c00a8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ddl.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-create index rtree_index_point_0 on MyData(point) type rtree;
-create index rtree_index_point on MyMiniData(point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.aql
deleted file mode 100644
index 35906d1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-for $o in dataset('MyMiniData')
-where spatial-intersect($o.point, create-polygon([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.aql
deleted file mode 100644
index 66c5c48..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type MyRecord as closed {
- id: int64,
- point: point,
- kwds: string,
- line1: line,
- line2: line,
- poly1: polygon,
- poly2: polygon,
- rec: rectangle,
- circle: circle
-}
-
-create type MyMiniRecord as closed {
- id: int64,
- point: point
-}
-
-create temporary dataset MyData(MyRecord)
- primary key id;
-
-create temporary dataset MyMiniData(MyMiniRecord)
- primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.aql
deleted file mode 100644
index 8fffba1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-load dataset MyMiniData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData0.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ddl.aql
deleted file mode 100644
index 6c00a8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ddl.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-create index rtree_index_point_0 on MyData(point) type rtree;
-create index rtree_index_point on MyMiniData(point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.update.aql
deleted file mode 100644
index 913be14..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.update.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-insert into dataset MyMiniData
-(
- for $m in dataset('MyData')
- return {
- "id": $m.id,
- "point": $m.point
- }
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.query.aql
deleted file mode 100644
index 35906d1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.query.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-for $o in dataset('MyMiniData')
-where spatial-intersect($o.point, create-polygon([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.aql
deleted file mode 100644
index a770f78..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.aql
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into a persistent dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use dataverse test;
-
-create type MyRecord as closed {
- id: int64,
- point: point,
- kwds: string,
- line1: line,
- line2: line,
- poly1: polygon,
- poly2: polygon,
- rec: rectangle,
- circle: circle
-}
-
-create type MyMiniRecord as closed {
- id: int64,
- point: point
-}
-
-create temporary dataset MyData(MyRecord)
- primary key id;
-
-create dataset MyMiniData(MyMiniRecord)
- primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.aql
deleted file mode 100644
index 8fffba1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.aql
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-load dataset MyData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData.json"),("format"="adm")) pre-sorted;
-
-load dataset MyMiniData
-using localfs
-(("path"="asterix_nc1://data/spatial/spatialData0.json"),("format"="adm")) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ddl.aql
deleted file mode 100644
index 6c00a8d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ddl.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-create index rtree_index_point_0 on MyData(point) type rtree;
-create index rtree_index_point on MyMiniData(point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.update.aql
deleted file mode 100644
index 913be14..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.update.aql
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-insert into dataset MyMiniData
-(
- for $m in dataset('MyData')
- return {
- "id": $m.id,
- "point": $m.point
- }
-);
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.query.aql
deleted file mode 100644
index 35906d1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.query.aql
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use dataverse test;
-
-for $o in dataset('MyMiniData')
-where spatial-intersect($o.point, create-polygon([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by $o.id
-return {"id":$o.id}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.1.ddl.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.1.ddl.aql
deleted file mode 100644
index 671e5a2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.1.ddl.aql
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : temp_primary_plus_ngram_flush.aql
- * Description : Check that flush for temporary datasets with ngram indexes succeeds.
- * Expected Result : Success
- * Date : Apr 4 2016
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
-row_id: int32,
-sid: int32,
-date: string,
-day: int32,
-time: string,
-bpm: int32,
-RR: float,
-text: string,
-location: point,
-text2: string
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
-row_id: int32,
-sid: int32,
-date: date,
-day: int32,
-time: time,
-bpm: int32,
-RR: float,
-text: string,
-location: point,
-text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
-/* Create default secondary index on dataset clean Fragile */
-create index cfText2Ix on Fragile(text2) type ngram(3);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.2.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.2.update.aql
deleted file mode 100644
index 1b3cbd3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.2.update.aql
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : temp_primary_plus_ngram_flush.aql
- * Description : Check that flush for temporary datasets with ngram indexes succeeds.
- * Expected Result : Success
- * Date : Apr 4 2016
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
-for $t in dataset Fragile_raw
-where $t.row_id <= 1000
-return {
-"row_id": $t.row_id,
-"sid": $t.sid,
-"date": date($t.date),
-"day": $t.day,
-"time": parse-time($t.time, "h:m:s"),
-"bpm": $t.bpm,
-"RR": $t.RR,
-"text": $t.text,
-"location": $t.location,
-"text2": $t.text2}
-);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.3.query.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.3.query.aql
deleted file mode 100644
index 67c41d6..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.3.query.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : temp_primary_plus_ngram_flush.aql
- * Description : Check that flush for temporary datasets with ngram indexes succeeds.
- * Expected Result : Success
- * Date : Apr 4 2016
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile
-where contains($x.text2, "location") return $x);
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-no-field/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp
similarity index 78%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-no-field/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp
index 5a6708a..b04d413 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/dml/load-with-autogenerated-no-field/load-with-autogenerated-pk_txt_01.1.ddl.sqlpp
@@ -16,14 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
+
+drop dataverse test if exists;
+create dataverse test;
use test;
-delete from MyData
- where id > 10;
+create type test.DBLPType as
+ closed {
+ id : uuid,
+ title : string,
+ authors : string
+};
+
+create dataset DBLP(DBLPType) primary key not_id autogenerated ;
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.1.ddl.sqlpp
new file mode 100644
index 0000000..c201040
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.1.ddl.sqlpp
@@ -0,0 +1,58 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Description : Full-text search non-index test
+ * : This test is intended to verify that the full-text search works as expected
+ * : with multiple conditions.
+ * : query #3 - two string values in [an ordered list] query with "any" option
+ * : in this case, "any" option that enforces a disjunctive search will be applied.
+ * : query #4 - the same as query #3, but with a different option - "all"
+ * : in this case, we explicitly specify "all" option that enforces a conjunctive search.
+ * : query #5 - two string values in {{an unordered list}} query with "any" option
+ * : in this case, "any" option that enforces a disjunctive search will be applied.
+ * : query #6 - the same as query #6, but with a different option - "all"
+ * : in this case, we explicitly specify "all" option that enforces a conjunctive search.
+ * : query #7 - the same as query #4, but without any option that is equivalent to "all".
+ * : query #8 - the same as query #6, but without any option that is equivalent to "all".
+ * Expected Result : Success
+ *
+*/
+
+drop dataverse test if exists;
+create dataverse test;
+use test;
+
+create type MyRecord as closed {
+ id: int64,
+ docid: int64,
+ val1: int64,
+ title: string,
+ point: point,
+ kwds: string,
+ line1: line,
+ line2: line,
+ poly1: polygon,
+ poly2: polygon,
+ rec: rectangle,
+ circle: circle
+};
+
+create dataset MyData(MyRecord)
+ primary key id;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.2.update.sqlpp
similarity index 86%
rename from asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.2.update.sqlpp
index f303a93..9b7c1f6 100644
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.2.update.sqlpp
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-use dataverse recovery;
-delete $r from dataset Fragile_raw
- where $r.row_id % 2 = 1
-;
+use test;
+
+load dataset MyData
+using localfs
+(("path"="asterix_nc1://data/spatial/spatialData2.json"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.3.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.3.query.sqlpp
index 5a6708a..02d27ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.3.query.sqlpp
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, ["object","database"], {"mode":"any"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.4.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.4.query.sqlpp
index 5a6708a..f495022 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.4.query.sqlpp
@@ -16,14 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, ["object","database"], {"mode":"all"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.5.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.5.query.sqlpp
index 5a6708a..8bf8eba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.5.query.sqlpp
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, {{"object","database"}}, {"mode":"any"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.6.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.6.query.sqlpp
index 5a6708a..6a2c2ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.6.query.sqlpp
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, {{"object","database"}}, {"mode":"all"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.7.query.sqlpp
similarity index 81%
copy from asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.7.query.sqlpp
index f303a93..14ec94f 100644
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.7.query.sqlpp
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-use dataverse recovery;
-delete $r from dataset Fragile_raw
- where $r.row_id % 2 = 1
-;
+use test;
+
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, ["object","database"]) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.8.query.sqlpp
similarity index 81%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.8.query.sqlpp
index ebe3e6a..c770842 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-09/fulltext-09.8.query.sqlpp
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
+use test;
+
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, {{"object","database"}}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.1.ddl.sqlpp
new file mode 100644
index 0000000..5848e28
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.1.ddl.sqlpp
@@ -0,0 +1,60 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+/*
+ * Description : Full-text search index test
+ * : This test is intended to verify that the full-text search works as expected
+ * : with multiple conditions.
+ * : query #3 - two string values in [an ordered list] query with "any" option
+ * : in this case, "any" option that enforces a disjunctive search will be applied.
+ * : query #4 - the same as query #3, but with a different option - "all"
+ * : in this case, we explicitly specify "all" option that enforces a conjunctive search.
+ * : query #5 - two string values in {{an unordered list}} query with "any" option
+ * : in this case, "any" option that enforces a disjunctive search will be applied.
+ * : query #6 - the same as query #6, but with a different option - "all"
+ * : in this case, we explicitly specify "all" option that enforces a conjunctive search.
+ * : query #7 - the same as query #4, but without any option that is equivalent to "all".
+ * : query #8 - the same as query #6, but without any option that is equivalent to "all".
+ * Expected Result : Success
+ *
+*/
+
+drop dataverse test if exists;
+create dataverse test;
+use test;
+
+create type MyRecord as closed {
+ id: int64,
+ docid: int64,
+ val1: int64,
+ title: string,
+ point: point,
+ kwds: string,
+ line1: line,
+ line2: line,
+ poly1: polygon,
+ poly2: polygon,
+ rec: rectangle,
+ circle: circle
+};
+
+create dataset MyData(MyRecord)
+ primary key id;
+
+create index fulltext_index_title on MyData(title) type fulltext;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.2.update.sqlpp
similarity index 86%
copy from asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.2.update.sqlpp
index f303a93..9b7c1f6 100644
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.2.update.sqlpp
@@ -16,8 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-use dataverse recovery;
-delete $r from dataset Fragile_raw
- where $r.row_id % 2 = 1
-;
+use test;
+
+load dataset MyData
+using localfs
+(("path"="asterix_nc1://data/spatial/spatialData2.json"),("format"="adm"));
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.3.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.3.query.sqlpp
index 5a6708a..02d27ab 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.3.query.sqlpp
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, ["object","database"], {"mode":"any"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.4.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.4.query.sqlpp
index 5a6708a..f495022 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.4.query.sqlpp
@@ -16,14 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, ["object","database"], {"mode":"all"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.5.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.5.query.sqlpp
index 5a6708a..8bf8eba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.5.query.sqlpp
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, {{"object","database"}}, {"mode":"any"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.6.query.sqlpp
similarity index 80%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.6.query.sqlpp
index 5a6708a..6a2c2ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.6.query.sqlpp
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
use test;
-
-delete from MyData
- where id > 10;
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, {{"object","database"}}, {"mode":"all"}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.7.query.sqlpp
similarity index 81%
copy from asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.7.query.sqlpp
index f303a93..14ec94f 100644
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.6.update.aql
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.7.query.sqlpp
@@ -16,8 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-use dataverse recovery;
-delete $r from dataset Fragile_raw
- where $r.row_id % 2 = 1
-;
+use test;
+
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, ["object","database"]) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.8.query.sqlpp
similarity index 81%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.8.query.sqlpp
index ebe3e6a..c770842 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/fulltext/fulltext-index-08/fulltext-index-08.8.query.sqlpp
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
+use test;
+
+select element {"id":ftval.id}
+from MyData as ftval
+where test.ftcontains(ftval.title, {{"object","database"}}) and ftval.val1 > 0 and ftval.val1 < 200
+order by ftval.id;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.1.ddl.sqlpp
similarity index 73%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.1.ddl.sqlpp
index c716bbe..53c5a21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.1.ddl.sqlpp
@@ -17,10 +17,9 @@
* under the License.
*/
/*
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : July 11 2013
+ * Date : Oct 31 2017
*/
drop dataverse test if exists;
@@ -29,10 +28,15 @@
use test;
-create type test.myDataType as
-{
- id : bigint
+create type test.Emp as
+ closed {
+ id : bigint,
+ fname : string,
+ lname : string,
+ age : bigint,
+ dept : string
};
-create temporary dataset myData(myDataType) primary key id;
+create dataset employee(Emp) primary key id;
+create primary index sec_primary_idx on employee ;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.2.update.sqlpp
similarity index 77%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.2.update.sqlpp
index aa13cc7..a2b8188 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.2.update.sqlpp
@@ -17,16 +17,13 @@
* under the License.
*/
/*
- * Description : Delete a portion of data from a loaded temporary dataset.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : 27th March 2015
- *
+ * Date : Oct 31 2017
*/
use test;
-select element c
-from LineItem as c
-order by c.l_orderkey,c.l_linenumber
-;
+load dataset employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.3.query.sqlpp
similarity index 84%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.3.query.sqlpp
index 5a6708a..5d47c41 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.3.query.sqlpp
@@ -17,13 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : March 27 2015
+ * Date : Oct 31 2017
*/
use test;
-
-delete from MyData
- where id > 10;
+select count(*) from employee;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.1.ddl.sqlpp
similarity index 73%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.1.ddl.sqlpp
index c716bbe..53c5a21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.1.ddl.sqlpp
@@ -17,10 +17,9 @@
* under the License.
*/
/*
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : July 11 2013
+ * Date : Oct 31 2017
*/
drop dataverse test if exists;
@@ -29,10 +28,15 @@
use test;
-create type test.myDataType as
-{
- id : bigint
+create type test.Emp as
+ closed {
+ id : bigint,
+ fname : string,
+ lname : string,
+ age : bigint,
+ dept : string
};
-create temporary dataset myData(myDataType) primary key id;
+create dataset employee(Emp) primary key id;
+create primary index sec_primary_idx on employee ;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.2.update.sqlpp
similarity index 77%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.2.update.sqlpp
index aa13cc7..a2b8188 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.2.update.sqlpp
@@ -17,16 +17,13 @@
* under the License.
*/
/*
- * Description : Delete a portion of data from a loaded temporary dataset.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : 27th March 2015
- *
+ * Date : Oct 31 2017
*/
use test;
-select element c
-from LineItem as c
-order by c.l_orderkey,c.l_linenumber
-;
+load dataset employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.3.query.sqlpp
similarity index 83%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.3.query.sqlpp
index 5a6708a..f4c22c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.3.query.sqlpp
@@ -17,13 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : March 27 2015
+ * Date : Oct 31 2017
*/
use test;
-
-delete from MyData
- where id > 10;
+select count(*) from employee e where e.id > 500;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.1.ddl.sqlpp
similarity index 73%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.1.ddl.sqlpp
index c716bbe..53c5a21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.1.ddl.sqlpp
@@ -17,10 +17,9 @@
* under the License.
*/
/*
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : July 11 2013
+ * Date : Oct 31 2017
*/
drop dataverse test if exists;
@@ -29,10 +28,15 @@
use test;
-create type test.myDataType as
-{
- id : bigint
+create type test.Emp as
+ closed {
+ id : bigint,
+ fname : string,
+ lname : string,
+ age : bigint,
+ dept : string
};
-create temporary dataset myData(myDataType) primary key id;
+create dataset employee(Emp) primary key id;
+create primary index sec_primary_idx on employee ;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.2.update.sqlpp
similarity index 77%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.2.update.sqlpp
index aa13cc7..a2b8188 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.2.update.sqlpp
@@ -17,16 +17,13 @@
* under the License.
*/
/*
- * Description : Delete a portion of data from a loaded temporary dataset.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : 27th March 2015
- *
+ * Date : Oct 31 2017
*/
use test;
-select element c
-from LineItem as c
-order by c.l_orderkey,c.l_linenumber
-;
+load dataset employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.3.query.sqlpp
similarity index 84%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.3.query.sqlpp
index 5a6708a..8c55f86 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.3.query.sqlpp
@@ -17,13 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : March 27 2015
+ * Date : Oct 31 2017
*/
use test;
-
-delete from MyData
- where id > 10;
+select MAX(e.id) from employee e;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.1.ddl.sqlpp
similarity index 73%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.1.ddl.sqlpp
index c716bbe..53c5a21 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ddl.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.1.ddl.sqlpp
@@ -17,10 +17,9 @@
* under the License.
*/
/*
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : July 11 2013
+ * Date : Oct 31 2017
*/
drop dataverse test if exists;
@@ -29,10 +28,15 @@
use test;
-create type test.myDataType as
-{
- id : bigint
+create type test.Emp as
+ closed {
+ id : bigint,
+ fname : string,
+ lname : string,
+ age : bigint,
+ dept : string
};
-create temporary dataset myData(myDataType) primary key id;
+create dataset employee(Emp) primary key id;
+create primary index sec_primary_idx on employee ;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.2.update.sqlpp
similarity index 77%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
copy to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.2.update.sqlpp
index aa13cc7..a2b8188 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.query.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.2.update.sqlpp
@@ -17,16 +17,13 @@
* under the License.
*/
/*
- * Description : Delete a portion of data from a loaded temporary dataset.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : 27th March 2015
- *
+ * Date : Oct 31 2017
*/
use test;
-select element c
-from LineItem as c
-order by c.l_orderkey,c.l_linenumber
-;
+load dataset employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
+
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.3.query.sqlpp
similarity index 84%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
rename to asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.3.query.sqlpp
index 5a6708a..b86d634 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.update.sqlpp
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.3.query.sqlpp
@@ -17,13 +17,11 @@
* under the License.
*/
/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
+ * Description : Testing using the secondary primary index for aggregation
* Expected Result : Success
- * Date : March 27 2015
+ * Date : Oct 31 2017
*/
use test;
-
-delete from MyData
- where id > 10;
+select count(e.id) from employee e;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
deleted file mode 100644
index 016b37e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ddl.sqlpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.LineItemType as
- closed {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : bigint,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
-};
-
-create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp
deleted file mode 100644
index 5ebf862..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.update.sqlpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-load dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.sqlpp
deleted file mode 100644
index 55f14eb..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ddl.sqlpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-create index idx_LineItem_partkey on LineItem (l_linenumber) type btree;
-
-create index idx_LineItem_suppkey on LineItem (l_suppkey) type btree;
-
-create primary index sec_primary_idx on LineItem;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.sqlpp
deleted file mode 100644
index 71a5f53..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.update.sqlpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-delete from LineItem
- where l_suppkey >= 2 or l_linenumber > 1;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.sqlpp
deleted file mode 100644
index dff3496..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.query.sqlpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset with indexes.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-select element c
-from LineItem as c
-where (c.l_suppkey < 150)
-order by c.l_orderkey,c.l_linenumber
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
deleted file mode 100644
index 617f5c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ddl.sqlpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.LineItemType as
- closed {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : bigint,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
-};
-
-create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp
deleted file mode 100644
index eb0f76e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete a portion of data from a loaded temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-load dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
-
-delete from LineItem
- where l_orderkey >= 10;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
deleted file mode 100644
index 4ca67fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ddl.sqlpp
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.Name as
-{
- first : string,
- last : string
-};
-
-create type test.Person as
-{
- name : Name
-};
-
-create type test.TestType as
-{
- id : integer,
- name : string,
- locn : point,
- zip : string,
- person : Person
-};
-
-create temporary dataset t1(TestType) primary key id;
-
-create index rtree_index_point on t1 (locn) type rtree;
-
-create index rtree_index_point_open on t1 (open_locn:point?) type rtree enforced;
-
-create index keyWD_indx on t1 (name) type keyword;
-
-create index keyWD_indx_open on t1 (nickname:string?) type keyword enforced;
-
-create index secndIndx on t1 (zip) type btree;
-
-create index nested on t1 (person.name.first) type btree;
-
-create index secndIndx_open on t1 (address:string?) type btree enforced;
-
-create primary index sec_primary_idx on t1;
-
-drop index t1.rtree_index_point;
-drop index t1.rtree_index_point_open;
-drop index t1.keyWD_indx;
-drop index t1.keyWD_indx_open;
-drop index t1.secndIndx;
-drop index t1.nested;
-drop index t1.secndIndx_open;
-drop index t1.sec_primary_idx;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.sqlpp
deleted file mode 100644
index 78e103b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.query.sqlpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop empty secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-select element l
-from `Metadata.Index` as l
-where ((l.IsPrimary = false) and (l.DataverseName = 'test'))
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
deleted file mode 100644
index 00e7e20..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.1.ddl.sqlpp
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.Schema as
- closed {
- unique1 : bigint,
- unique2 : bigint,
- two : bigint,
- four : bigint,
- ten : bigint,
- twenty : bigint,
- onePercent : bigint,
- tenPercent : bigint,
- twentyPercent : bigint,
- fiftyPercent : bigint,
- unique3 : bigint,
- evenOnePercent : bigint,
- oddOnePercent : bigint,
- stringu1 : string,
- stringu2 : string,
- string4 : string
-};
-
-create temporary dataset t1(Schema) primary key unique2;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp
deleted file mode 100644
index 23906a4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.2.update.sqlpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-load dataset t1 using localfs ((`path`=`asterix_nc1://data/wisc/onektup.adm`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.3.ddl.sqlpp
deleted file mode 100644
index f01f959..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.3.ddl.sqlpp
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-create index idx_t1_str1 on t1 (stringu1) type btree;
-
-create index idx_t1_unique1 on t1 (unique1) type btree;
-
-create primary index sec_primary_idx on t1;
-
-drop index t1.idx_t1_str1;
-drop index t1.idx_t1_unique1;
-drop index t1.sec_primary_idx;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.4.query.sqlpp
deleted file mode 100644
index 0950324..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/drop-index/drop-index.4.query.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
-
-use test;
-
-
-select element a
-from t1 as a
-where ((a.unique1 > 10) and (a.stringu1 = 'DGAAAAXXXXXXXXXXXXXXXXXXX'))
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
deleted file mode 100644
index 2b169dd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ddl.sqlpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Load a temporary dataset with previously created empty indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.LineItemType as
- closed {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : double,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
-};
-
-create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
-
-create index part_index on LineItem (l_partkey) type btree;
-
-create primary index sec_primary_idx on LineItem ;
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp
deleted file mode 100644
index ef9dd8f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.update.sqlpp
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Load a temporary dataset with previously created empty indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-load dataset LineItem using localfs ((`path`=`asterix_nc1://data/empty.adm`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
-
-load dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.query.sqlpp
deleted file mode 100644
index a4c443a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.query.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Load a temporary dataset with previously created empty indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-select element c
-from LineItem as c
-order by c.l_orderkey,c.l_linenumber
-limit 1
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp
deleted file mode 100644
index 6c1595df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.1.ddl.sqlpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data at the same time where we insert a materializing to prevent the possibility
- * of deadlatch.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.Emp as
- closed {
- id : bigint,
- fname : string,
- lname : string,
- age : bigint,
- dept : string
-};
-
-create temporary dataset test.employee(Emp) primary key id
-using compaction policy `correlated-prefix`
-((`max-mergable-component-size`=`16384`),(`max-tolerance-component-count`=`3`));
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.2.update.sqlpp
deleted file mode 100644
index 969f8ef..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.2.update.sqlpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data at the same time where we insert a materializing to prevent the possibility
- * of deadlatch.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-use test;
-
-
-load dataset test.employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
-
-insert into test.employee
-select element {'id':(x.id + 10000),'fname':x.fname,'lname':x.lname,'age':x.age,'dept':x.dept}
-from `test.employee` as x
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.3.ddl.sqlpp
deleted file mode 100644
index c3ee05f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.3.ddl.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data at the same time where we insert a materializing to prevent the possibility
- * of deadlatch.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-use test;
-
-create index idx_employee_first_name on test.employee (fname) type btree;
-
-create primary index sec_primary_idx on test.employee;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.4.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.4.query.sqlpp
deleted file mode 100644
index a179e16..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-correlated-index/insert-and-scan-dataset-with-correlated-index.4.query.sqlpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a correlated
- * secondary index and scan the data at the same time where we insert a materializing to prevent the possibility
- * of deadlatch.
- * Expected Result : Success
- * Date : June 8 2017
- */
-
-use test;
-
-
-select element l
-from `test.employee` as l
-order by l.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
deleted file mode 100644
index e9aae4a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ddl.sqlpp
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-create type test.Emp as
- closed {
- id : bigint,
- fname : string,
- lname : string,
- age : bigint,
- dept : string
-};
-
-create temporary dataset test.employee(Emp) primary key id;
-
-create index idx_employee_first_name on test.employee (fname) type btree;
-
-create primary index sec_primary_idx on test.employee;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp
deleted file mode 100644
index da759b4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.update.sqlpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 28 2015
- */
-
-use test;
-
-
-load dataset test.employee using localfs ((`path`=`asterix_nc1://data/names.adm`),(`format`=`delimited-text`),(`delimiter`=`|`));
-
-insert into test.employee
-select element {'id':(x.id + 10000),'fname':x.fname,'lname':x.lname,'age':x.age,'dept':x.dept}
-from `test.employee` as x
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.query.sqlpp
deleted file mode 100644
index 065e5b9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.query.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : This test is intended to test inserting into a temporary dataset that has a secondary index and scan
- * the data at the same time where we insert a materializing to prevent the possibility of dead latch.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-select element l
-from `test.employee` as l
-order by l.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp
deleted file mode 100644
index 06917df..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.update.sqlpp
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : insert-and-scan-dataset.aql
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-load dataset myData using localfs ((`path`=`asterix_nc1://data/odd-numbers.adm`),(`format`=`adm`)) pre-sorted;
-
-insert into myData
-select element {'id':(x.id + 1)}
-from myData as x
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.query.sqlpp
deleted file mode 100644
index 4418b67..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.query.sqlpp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : insert-and-scan-dataset.aql
- * Description : This test is intended to test inserting into a temporary dataset and scan it at the same time
- * where we insert a materializing to prevent the possibility of deadlatch.
- * Expected Result : Success
- * Date : March 27 2015
- *
- */
-
-use test;
-
-
-select element c
-from myData as c
-order by c.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
deleted file mode 100644
index 45cde93..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ddl.sqlpp
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Test a read query over a temporary dataset.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse tpch if exists;
-create dataverse tpch;
-
-use tpch;
-
-
-create type tpch.LineItemType as
- closed {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : double,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
-};
-
-create temporary dataset LineItem(LineItemType) primary key l_orderkey,l_linenumber;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp
deleted file mode 100644
index 696a84b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.update.sqlpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Test a read query over a temporary dataset.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use tpch;
-
-
-load dataset LineItem using localfs ((`path`=`asterix_nc1://data/tpch0.001/lineitem.tbl`),(`format`=`delimited-text`),(`delimiter`=`|`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
deleted file mode 100644
index 4a5eae4..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.query.sqlpp
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Test a read query over a temporary dataset.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use tpch;
-
-
-set `import-private-functions` `true`;
-
-select element {'l_returnflag':l_returnflag,'l_linestatus':l_linestatus,
- 'sum_qty': sum(l.l_quantity),
- 'sum_base_price': sum(l.l_extendedprice),
- 'sum_disc_price': sum(l.l_extendedprice * (1 - l.l_discount)),
- 'sum_charge': sum(l.l_extendedprice * (1 - l.l_discount) * (1 + l.l_tax)),
- 'ave_qty': avg(l.l_quantity),
- 'ave_price': avg(l.l_extendedprice),
- 'ave_disc': avg(l.l_discount),
- 'count_order': count(*)}
-from LineItem as l
-where (l.l_shipdate <= '1998-09-02')
-/* +hash */
-group by l.l_returnflag as l_returnflag,l.l_linestatus as l_linestatus
-order by l_returnflag,l_linestatus
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp
deleted file mode 100644
index 39eaee2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.update.sqlpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-load dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ddl.sqlpp
deleted file mode 100644
index 56a3186..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ddl.sqlpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-create index rtree_index_point on MyData (point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.query.sqlpp
deleted file mode 100644
index 7e2f12e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.query.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Delete tuples from a temporary dataset with a R-tree index.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-select element {'id':o.id}
-from MyData as o
-where test.`spatial-intersect`(o.point,test.`create-polygon`([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by o.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
deleted file mode 100644
index b352768..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ddl.sqlpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a persistent dataset into a temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
-};
-
-create type test.MyMiniRecord as
- closed {
- id : bigint,
- point : point
-};
-
-create dataset MyData(MyRecord) primary key id;
-
-create temporary dataset MyMiniData(MyMiniRecord) primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp
deleted file mode 100644
index c2214c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-load dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
-
-load dataset MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ddl.sqlpp
deleted file mode 100644
index 98bfaf8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ddl.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-create index rtree_index_point_0 on MyData (point) type rtree;
-
-create index rtree_index_point on MyMiniData (point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.update.sqlpp
deleted file mode 100644
index 7ab14fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-insert into MyMiniData
-select element {'id':m.id,'point':m.point}
-from MyData as m
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
deleted file mode 100644
index 8d1110a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ddl.sqlpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
-};
-
-create type test.MyMiniRecord as
- closed {
- id : bigint,
- point : point
-};
-
-create temporary dataset MyData(MyRecord) primary key id;
-
-create temporary dataset MyMiniData(MyMiniRecord) primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp
deleted file mode 100644
index c2214c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-load dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
-
-load dataset MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ddl.sqlpp
deleted file mode 100644
index 98bfaf8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ddl.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-create index rtree_index_point_0 on MyData (point) type rtree;
-
-create index rtree_index_point on MyMiniData (point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.update.sqlpp
deleted file mode 100644
index 7ab14fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-insert into MyMiniData
-select element {'id':m.id,'point':m.point}
-from MyData as m
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.query.sqlpp
deleted file mode 100644
index 33c063d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.query.sqlpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-select element {'id':o.id}
-from MyMiniData as o
-where test.`spatial-intersect`(o.point,test.`create-polygon`([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by o.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
deleted file mode 100644
index f7e32ab..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ddl.sqlpp
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into a persistent dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-drop dataverse test if exists;
-create dataverse test;
-
-use test;
-
-
-create type test.MyRecord as
- closed {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
-};
-
-create type test.MyMiniRecord as
- closed {
- id : bigint,
- point : point
-};
-
-create temporary dataset MyData(MyRecord) primary key id;
-
-create dataset MyMiniData(MyMiniRecord) primary key id;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp
deleted file mode 100644
index c2214c9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-load dataset MyData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData.json`),(`format`=`adm`)) pre-sorted;
-
-load dataset MyMiniData using localfs ((`path`=`asterix_nc1://data/spatial/spatialData0.json`),(`format`=`adm`)) pre-sorted;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ddl.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ddl.sqlpp
deleted file mode 100644
index 98bfaf8..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ddl.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-create index rtree_index_point_0 on MyData (point) type rtree;
-
-create index rtree_index_point on MyMiniData (point) type rtree;
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.update.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.update.sqlpp
deleted file mode 100644
index 7ab14fe..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.update.sqlpp
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-insert into MyMiniData
-select element {'id':m.id,'point':m.point}
-from MyData as m
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.query.sqlpp b/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.query.sqlpp
deleted file mode 100644
index 33c063d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.query.sqlpp
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
-
-use test;
-
-
-select element {'id':o.id}
-from MyMiniData as o
-where test.`spatial-intersect`(o.point,test.`create-polygon`([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by o.id
-;
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.3.adm
new file mode 100644
index 0000000..9b34c44
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.3.adm
@@ -0,0 +1,38 @@
+{ "id": 1 }
+{ "id": 2 }
+{ "id": 5 }
+{ "id": 6 }
+{ "id": 8 }
+{ "id": 11 }
+{ "id": 12 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 17 }
+{ "id": 19 }
+{ "id": 20 }
+{ "id": 21 }
+{ "id": 22 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 27 }
+{ "id": 29 }
+{ "id": 30 }
+{ "id": 31 }
+{ "id": 32 }
+{ "id": 35 }
+{ "id": 36 }
+{ "id": 38 }
+{ "id": 41 }
+{ "id": 42 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 47 }
+{ "id": 49 }
+{ "id": 50 }
+{ "id": 51 }
+{ "id": 52 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 57 }
+{ "id": 59 }
+{ "id": 60 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.4.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.4.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.5.adm
new file mode 100644
index 0000000..9b34c44
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.5.adm
@@ -0,0 +1,38 @@
+{ "id": 1 }
+{ "id": 2 }
+{ "id": 5 }
+{ "id": 6 }
+{ "id": 8 }
+{ "id": 11 }
+{ "id": 12 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 17 }
+{ "id": 19 }
+{ "id": 20 }
+{ "id": 21 }
+{ "id": 22 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 27 }
+{ "id": 29 }
+{ "id": 30 }
+{ "id": 31 }
+{ "id": 32 }
+{ "id": 35 }
+{ "id": 36 }
+{ "id": 38 }
+{ "id": 41 }
+{ "id": 42 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 47 }
+{ "id": 49 }
+{ "id": 50 }
+{ "id": 51 }
+{ "id": 52 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 57 }
+{ "id": 59 }
+{ "id": 60 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.6.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.6.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.7.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.7.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.8.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-09/fulltext-09.8.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-02.8.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-02.8.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-02.8.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.3.adm
new file mode 100644
index 0000000..9b34c44
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.3.adm
@@ -0,0 +1,38 @@
+{ "id": 1 }
+{ "id": 2 }
+{ "id": 5 }
+{ "id": 6 }
+{ "id": 8 }
+{ "id": 11 }
+{ "id": 12 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 17 }
+{ "id": 19 }
+{ "id": 20 }
+{ "id": 21 }
+{ "id": 22 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 27 }
+{ "id": 29 }
+{ "id": 30 }
+{ "id": 31 }
+{ "id": 32 }
+{ "id": 35 }
+{ "id": 36 }
+{ "id": 38 }
+{ "id": 41 }
+{ "id": 42 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 47 }
+{ "id": 49 }
+{ "id": 50 }
+{ "id": 51 }
+{ "id": 52 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 57 }
+{ "id": 59 }
+{ "id": 60 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.4.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.4.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.4.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.5.adm
new file mode 100644
index 0000000..9b34c44
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.5.adm
@@ -0,0 +1,38 @@
+{ "id": 1 }
+{ "id": 2 }
+{ "id": 5 }
+{ "id": 6 }
+{ "id": 8 }
+{ "id": 11 }
+{ "id": 12 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 17 }
+{ "id": 19 }
+{ "id": 20 }
+{ "id": 21 }
+{ "id": 22 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 27 }
+{ "id": 29 }
+{ "id": 30 }
+{ "id": 31 }
+{ "id": 32 }
+{ "id": 35 }
+{ "id": 36 }
+{ "id": 38 }
+{ "id": 41 }
+{ "id": 42 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 47 }
+{ "id": 49 }
+{ "id": 50 }
+{ "id": 51 }
+{ "id": 52 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 57 }
+{ "id": 59 }
+{ "id": 60 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.6.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.6.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.7.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.7.adm
new file mode 100644
index 0000000..acde73f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/fulltext/fulltext-index-08/fulltext-index-08.7.adm
@@ -0,0 +1,14 @@
+{ "id": 8 }
+{ "id": 13 }
+{ "id": 16 }
+{ "id": 19 }
+{ "id": 23 }
+{ "id": 26 }
+{ "id": 29 }
+{ "id": 38 }
+{ "id": 43 }
+{ "id": 46 }
+{ "id": 49 }
+{ "id": 53 }
+{ "id": 56 }
+{ "id": 59 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.3.adm
new file mode 100644
index 0000000..044b3f5
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-01/btree-sec-primary-index-01.3.adm
@@ -0,0 +1 @@
+{ "$1": 120 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.3.adm
new file mode 100644
index 0000000..12d64a1
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-02/btree-sec-primary-index-02.3.adm
@@ -0,0 +1 @@
+{ "$1": 88 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.3.adm
new file mode 100644
index 0000000..ac25b3f
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-03/btree-sec-primary-index-03.3.adm
@@ -0,0 +1 @@
+{ "$1": 9941 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.3.adm
new file mode 100644
index 0000000..044b3f5
--- /dev/null
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/index-selection/btree-sec-primary-index-04/btree-sec-primary-index-04.3.adm
@@ -0,0 +1 @@
+{ "$1": 120 }
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.11.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.11.adm
index 8325e98..f57b2301 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.11.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.11.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch1/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch1/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch1/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch1/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch1/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch1/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch1/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch1/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.12.adm
index b93b62c..39cad23 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.12.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.12.adm
@@ -1 +1 @@
-{"temp":false,"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch2/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch2/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch2/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch2/2/Orders_idx_Orders"}]}
\ No newline at end of file
+{"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch2/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch2/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch2/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch2/2/Orders_idx_Orders"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.5.adm
index abe4c45..fa5763e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.5.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.5.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch1/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch1/1/LineItem_idx_LineItem"}]}
\ No newline at end of file
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch1/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch1/1/LineItem_idx_LineItem"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.6.adm
index 9b37249..b3dea05 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.6.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/all_datasets/all_datasets.6.adm
@@ -1 +1 @@
-{"temp":false,"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch2/1/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch2/1/Orders_idx_Orders"}]}
\ No newline at end of file
+{"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch2/1/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch2/1/Orders_idx_Orders"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.5.adm
index 4f0990e..8ff99de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.5.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.5.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/LineItem_idx_LineItem"}]}
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/LineItem_idx_LineItem"}]}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.9.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.9.adm
index 44c244c..6eece47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.9.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset/single_dataset.9.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.10.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.10.adm
index 44c244c..6eece47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.10.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.10.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.5.adm
index 4f0990e..8ff99de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.5.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataset_with_index/single_dataset_with_index.5.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/LineItem_idx_LineItem"}]}
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/LineItem_idx_LineItem"}]}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.11.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.11.adm
index 44c244c..6eece47 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.11.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.11.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/LineItem_idx_LineItem"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.12.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.12.adm
index 32a8aa9..5a549ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.12.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.12.adm
@@ -1 +1 @@
-{"temp":false,"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/Orders_idx_Orders"}]}
\ No newline at end of file
+{"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_2/tpch/2/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_3/tpch/2/Orders_idx_Orders"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.5.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.5.adm
index 4f0990e..8ff99de 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.5.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.5.adm
@@ -1 +1 @@
-{"temp":false,"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/LineItem_idx_LineItem"}]}
+{"keys":"l_orderkey,l_linenumber","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"LineItemType","open":false,"fields":[{"l_orderkey":{"type":"AInt64"}},{"l_partkey":{"type":"AInt64"}},{"l_suppkey":{"type":"AInt64"}},{"l_linenumber":{"type":"AInt64"}},{"l_quantity":{"type":"ADouble"}},{"l_extendedprice":{"type":"ADouble"}},{"l_discount":{"type":"ADouble"}},{"l_tax":{"type":"ADouble"}},{"l_returnflag":{"type":"AString"}},{"l_linestatus":{"type":"AString"}},{"l_shipdate":{"type":"AString"}},{"l_commitdate":{"type":"AString"}},{"l_receiptdate":{"type":"AString"}},{"l_shipinstruct":{"type":"AString"}},{"l_shipmode":{"type":"AString"}},{"l_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/LineItem_idx_LineItem"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/LineItem_idx_LineItem"}]}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.6.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.6.adm
index c5639c6..6889a70 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.6.adm
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results/rebalance/single_dataverse/single_dataverse.6.adm
@@ -1 +1 @@
-{"temp":false,"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/Orders_idx_Orders"}]}
\ No newline at end of file
+{"keys":"o_orderkey","type":{"type":"org.apache.asterix.om.types.ARecordType","name":"OrderType","open":false,"fields":[{"o_orderkey":{"type":"AInt64"}},{"o_custkey":{"type":"AInt64"}},{"o_orderstatus":{"type":"AString"}},{"o_totalprice":{"type":"ADouble"}},{"o_orderdate":{"type":"AString"}},{"o_orderpriority":{"type":"AString"}},{"o_clerk":{"type":"AString"}},{"o_shippriority":{"type":"AInt64"}},{"o_comment":{"type":"AString"}}]},"splits":[{"ip":"127.0.0.1","path":"storage/partition_0/tpch/1/Orders_idx_Orders"},{"ip":"127.0.0.1","path":"storage/partition_1/tpch/1/Orders_idx_Orders"}]}
\ No newline at end of file
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.adm
deleted file mode 100644
index 0d69984..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.1.adm
+++ /dev/null
@@ -1,167 +0,0 @@
-{ "l_orderkey": 36, "l_partkey": 120, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 42845.04d, "l_discount": 0.09d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-03", "l_commitdate": "1996-01-21", "l_receiptdate": "1996-02-23", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": " careful courts. special " }
-{ "l_orderkey": 68, "l_partkey": 8, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 2724.0d, "l_discount": 0.05d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-07-04", "l_commitdate": "1998-06-05", "l_receiptdate": "1998-07-21", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "fully special instructions cajole. furious" }
-{ "l_orderkey": 162, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2180.38d, "l_discount": 0.02d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-09-02", "l_commitdate": "1995-06-17", "l_receiptdate": "1995-09-08", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "es! final somas integrate" }
-{ "l_orderkey": 192, "l_partkey": 98, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 23, "l_extendedprice": 22956.07d, "l_discount": 0.0d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-02-05", "l_commitdate": "1998-02-06", "l_receiptdate": "1998-03-07", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "ly pending theodolites haggle quickly fluf" }
-{ "l_orderkey": 197, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 39, "l_extendedprice": 38964.51d, "l_discount": 0.02d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-07-21", "l_commitdate": "1995-07-01", "l_receiptdate": "1995-08-14", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "press accounts. daringly sp" }
-{ "l_orderkey": 227, "l_partkey": 166, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 19, "l_extendedprice": 20257.04d, "l_discount": 0.05d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-10", "l_commitdate": "1996-01-30", "l_receiptdate": "1995-12-26", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "s cajole furiously a" }
-{ "l_orderkey": 290, "l_partkey": 6, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 35, "l_extendedprice": 31710.0d, "l_discount": 0.01d, "l_tax": 0.02d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-04-01", "l_commitdate": "1994-02-05", "l_receiptdate": "1994-04-27", "l_shipinstruct": "NONE", "l_shipmode": "MAIL", "l_comment": "ove the final foxes detect slyly fluffily" }
-{ "l_orderkey": 325, "l_partkey": 159, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 34, "l_extendedprice": 36011.1d, "l_discount": 0.09d, "l_tax": 0.04d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-10-28", "l_commitdate": "1993-12-13", "l_receiptdate": "1993-11-17", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "ly bold deposits. always iron" }
-{ "l_orderkey": 355, "l_partkey": 114, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 31437.41d, "l_discount": 0.09d, "l_tax": 0.07d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-07-13", "l_commitdate": "1994-08-18", "l_receiptdate": "1994-07-18", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "y unusual, ironic" }
-{ "l_orderkey": 389, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2180.38d, "l_discount": 0.09d, "l_tax": 0.0d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-04-13", "l_commitdate": "1994-04-10", "l_receiptdate": "1994-04-25", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "fts. courts eat blithely even dependenc" }
-{ "l_orderkey": 391, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 14, "l_extendedprice": 14309.68d, "l_discount": 0.09d, "l_tax": 0.02d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1995-02-11", "l_commitdate": "1995-02-03", "l_receiptdate": "1995-02-13", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": " escapades sleep furiously about " }
-{ "l_orderkey": 417, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 39, "l_extendedprice": 36661.56d, "l_discount": 0.01d, "l_tax": 0.02d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-05-31", "l_commitdate": "1994-05-02", "l_receiptdate": "1994-06-06", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "y regular requests wake along " }
-{ "l_orderkey": 453, "l_partkey": 198, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 49418.55d, "l_discount": 0.01d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-30", "l_commitdate": "1997-08-20", "l_receiptdate": "1997-07-19", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "ifts wake carefully." }
-{ "l_orderkey": 485, "l_partkey": 150, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 50, "l_extendedprice": 52507.5d, "l_discount": 0.01d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-28", "l_commitdate": "1997-05-26", "l_receiptdate": "1997-04-18", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "iously quick excuses. carefully final f" }
-{ "l_orderkey": 545, "l_partkey": 170, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 4280.68d, "l_discount": 0.02d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-23", "l_commitdate": "1995-12-16", "l_receiptdate": "1996-03-21", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": ", ironic grouches cajole over" }
-{ "l_orderkey": 581, "l_partkey": 64, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 39526.46d, "l_discount": 0.09d, "l_tax": 0.07d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-26", "l_commitdate": "1997-04-06", "l_receiptdate": "1997-06-10", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "nts. quickly" }
-{ "l_orderkey": 647, "l_partkey": 17, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 37597.41d, "l_discount": 0.08d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-19", "l_commitdate": "1997-09-24", "l_receiptdate": "1997-12-15", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "r instructions. quickly unusu" }
-{ "l_orderkey": 704, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 43607.6d, "l_discount": 0.05d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-30", "l_commitdate": "1997-01-10", "l_receiptdate": "1997-02-20", "l_shipinstruct": "COLLECT COD", "l_shipmode": "AIR", "l_comment": "ggle quickly. r" }
-{ "l_orderkey": 738, "l_partkey": 198, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 34, "l_extendedprice": 37338.46d, "l_discount": 0.0d, "l_tax": 0.06d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-06-09", "l_commitdate": "1993-04-15", "l_receiptdate": "1993-07-09", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "s against the ironic exc" }
-{ "l_orderkey": 773, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 5, "l_extendedprice": 5000.5d, "l_discount": 0.06d, "l_tax": 0.04d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-11-21", "l_commitdate": "1993-12-19", "l_receiptdate": "1993-12-21", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "ar requests. regular, thin packages u" }
-{ "l_orderkey": 800, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 36938.66d, "l_discount": 0.0d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-07-21", "l_commitdate": "1998-09-25", "l_receiptdate": "1998-08-07", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "according to the bold, final dependencies " }
-{ "l_orderkey": 900, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 48364.36d, "l_discount": 0.01d, "l_tax": 0.06d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-15", "l_commitdate": "1994-12-03", "l_receiptdate": "1994-12-27", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": " detect quick" }
-{ "l_orderkey": 931, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 18, "l_extendedprice": 16920.72d, "l_discount": 0.0d, "l_tax": 0.05d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-04-04", "l_commitdate": "1993-01-11", "l_receiptdate": "1993-04-13", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "slyly ironic re" }
-{ "l_orderkey": 932, "l_partkey": 44, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 38705.64d, "l_discount": 0.01d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-05", "l_commitdate": "1997-07-22", "l_receiptdate": "1997-06-26", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "foxes. ironic pl" }
-{ "l_orderkey": 965, "l_partkey": 108, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 20, "l_extendedprice": 20162.0d, "l_discount": 0.04d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "F", "l_shipdate": "1995-06-16", "l_commitdate": "1995-07-20", "l_receiptdate": "1995-07-06", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "kly. carefully pending requ" }
-{ "l_orderkey": 995, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 16097.55d, "l_discount": 0.08d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-06-30", "l_commitdate": "1995-08-04", "l_receiptdate": "1995-07-27", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "uses. fluffily fina" }
-{ "l_orderkey": 1025, "l_partkey": 150, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 37805.4d, "l_discount": 0.03d, "l_tax": 0.04d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-05-15", "l_commitdate": "1995-07-05", "l_receiptdate": "1995-06-10", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "e unusual, regular instr" }
-{ "l_orderkey": 1027, "l_partkey": 156, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 45414.45d, "l_discount": 0.07d, "l_tax": 0.08d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-06-17", "l_commitdate": "1992-08-28", "l_receiptdate": "1992-07-10", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "oxes. carefully regular deposits" }
-{ "l_orderkey": 1155, "l_partkey": 70, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 3880.28d, "l_discount": 0.09d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-10-19", "l_commitdate": "1997-12-09", "l_receiptdate": "1997-11-02", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "ic foxes according to the carefully final " }
-{ "l_orderkey": 1185, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 7776.56d, "l_discount": 0.01d, "l_tax": 0.06d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-12-05", "l_commitdate": "1992-10-05", "l_receiptdate": "1992-12-28", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "ely according to the furiously regular r" }
-{ "l_orderkey": 1216, "l_partkey": 97, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 7976.72d, "l_discount": 0.03d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-02-01", "l_commitdate": "1993-03-06", "l_receiptdate": "1993-02-08", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": " of the carefully express" }
-{ "l_orderkey": 1223, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 28, "l_extendedprice": 28002.8d, "l_discount": 0.1d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-08-07", "l_commitdate": "1996-07-24", "l_receiptdate": "1996-08-13", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": " quickly ironic requests. furious" }
-{ "l_orderkey": 1381, "l_partkey": 144, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 49074.58d, "l_discount": 0.08d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-09-22", "l_commitdate": "1998-08-12", "l_receiptdate": "1998-10-12", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "ly ironic deposits" }
-{ "l_orderkey": 1409, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 23, "l_extendedprice": 22979.07d, "l_discount": 0.01d, "l_tax": 0.03d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-04-18", "l_commitdate": "1993-02-25", "l_receiptdate": "1993-05-06", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "ions. slyly ironic packages wake quick" }
-{ "l_orderkey": 1445, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 24, "l_extendedprice": 24002.4d, "l_discount": 0.01d, "l_tax": 0.0d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-02-21", "l_commitdate": "1995-02-22", "l_receiptdate": "1995-03-18", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "al accounts use furiously a" }
-{ "l_orderkey": 1477, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 30134.17d, "l_discount": 0.0d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-16", "l_commitdate": "1997-09-30", "l_receiptdate": "1997-12-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": " requests. fluffily final " }
-{ "l_orderkey": 1540, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 40780.46d, "l_discount": 0.03d, "l_tax": 0.01d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-09-30", "l_commitdate": "1992-10-27", "l_receiptdate": "1992-10-12", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": " final grouches bo" }
-{ "l_orderkey": 1568, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 35643.24d, "l_discount": 0.02d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-31", "l_commitdate": "1997-04-22", "l_receiptdate": "1997-06-21", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "platelets-- furiously sly excu" }
-{ "l_orderkey": 1605, "l_partkey": 142, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 48980.58d, "l_discount": 0.0d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-04-29", "l_commitdate": "1998-06-12", "l_receiptdate": "1998-05-20", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": ". carefully r" }
-{ "l_orderkey": 1607, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2180.38d, "l_discount": 0.02d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-11", "l_commitdate": "1996-02-15", "l_receiptdate": "1996-01-19", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "packages haggle. regular requests boost s" }
-{ "l_orderkey": 1635, "l_partkey": 71, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 2913.21d, "l_discount": 0.06d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-13", "l_commitdate": "1997-03-25", "l_receiptdate": "1997-03-27", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": " quickly ironic r" }
-{ "l_orderkey": 1700, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 39525.32d, "l_discount": 0.04d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-10-03", "l_commitdate": "1996-07-27", "l_receiptdate": "1996-10-22", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "ular dependencies engage slyly " }
-{ "l_orderkey": 1796, "l_partkey": 10, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 28, "l_extendedprice": 25480.28d, "l_discount": 0.08d, "l_tax": 0.04d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-12-01", "l_commitdate": "1993-01-01", "l_receiptdate": "1992-12-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "y quickly ironic accounts." }
-{ "l_orderkey": 1825, "l_partkey": 156, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 45414.45d, "l_discount": 0.05d, "l_tax": 0.05d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-02-18", "l_commitdate": "1994-02-19", "l_receiptdate": "1994-03-02", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": " accounts breach fluffily spe" }
-{ "l_orderkey": 1827, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 46534.23d, "l_discount": 0.0d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-08-01", "l_commitdate": "1996-08-07", "l_receiptdate": "1996-08-23", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": ". pending courts about the even e" }
-{ "l_orderkey": 1893, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 42960.87d, "l_discount": 0.1d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-01-25", "l_commitdate": "1998-01-06", "l_receiptdate": "1998-02-14", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "he carefully regular " }
-{ "l_orderkey": 1924, "l_partkey": 73, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 6811.49d, "l_discount": 0.06d, "l_tax": 0.07d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-01", "l_commitdate": "1996-12-02", "l_receiptdate": "1997-01-08", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "osits. even accounts nag furious" }
-{ "l_orderkey": 1953, "l_partkey": 128, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 25, "l_extendedprice": 25703.0d, "l_discount": 0.07d, "l_tax": 0.06d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-01-07", "l_commitdate": "1994-01-28", "l_receiptdate": "1994-01-29", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ular, regular i" }
-{ "l_orderkey": 1985, "l_partkey": 28, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 33, "l_extendedprice": 30624.66d, "l_discount": 0.1d, "l_tax": 0.03d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-04", "l_commitdate": "1994-11-01", "l_receiptdate": "1994-12-05", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "s are express packages. pendin" }
-{ "l_orderkey": 1988, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 34994.52d, "l_discount": 0.09d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-21", "l_commitdate": "1995-11-24", "l_receiptdate": "1996-01-27", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "gular theodolites. " }
-{ "l_orderkey": 2048, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 6545.21d, "l_discount": 0.06d, "l_tax": 0.01d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-12-07", "l_commitdate": "1994-01-31", "l_receiptdate": "1994-01-05", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "lent platelets boost deposits. carefully sp" }
-{ "l_orderkey": 2086, "l_partkey": 60, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 22, "l_extendedprice": 21121.32d, "l_discount": 0.03d, "l_tax": 0.07d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-04", "l_commitdate": "1994-12-16", "l_receiptdate": "1994-12-20", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "RAIL", "l_comment": "idly busy acc" }
-{ "l_orderkey": 2118, "l_partkey": 160, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 24, "l_extendedprice": 25443.84d, "l_discount": 0.1d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-06", "l_commitdate": "1996-12-14", "l_receiptdate": "1997-01-14", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "about the slyly bold depende" }
-{ "l_orderkey": 2183, "l_partkey": 71, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 28161.03d, "l_discount": 0.05d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-21", "l_commitdate": "1996-08-24", "l_receiptdate": "1996-08-15", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ly unusual deposits sleep carefully" }
-{ "l_orderkey": 2211, "l_partkey": 48, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 25, "l_extendedprice": 23701.0d, "l_discount": 0.04d, "l_tax": 0.01d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-10-09", "l_commitdate": "1994-08-04", "l_receiptdate": "1994-11-03", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "deas. carefully special theodolites along" }
-{ "l_orderkey": 2215, "l_partkey": 73, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 33, "l_extendedprice": 32111.31d, "l_discount": 0.0d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-19", "l_commitdate": "1996-08-10", "l_receiptdate": "1996-07-30", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "dolites cajole b" }
-{ "l_orderkey": 2272, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 18, "l_extendedprice": 17821.62d, "l_discount": 0.04d, "l_tax": 0.0d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-08-01", "l_commitdate": "1993-07-06", "l_receiptdate": "1993-08-25", "l_shipinstruct": "NONE", "l_shipmode": "MAIL", "l_comment": "ons along the blithely e" }
-{ "l_orderkey": 2342, "l_partkey": 42, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 11304.48d, "l_discount": 0.0d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-31", "l_commitdate": "1996-07-26", "l_receiptdate": "1996-08-14", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "print blithely even deposits. carefull" }
-{ "l_orderkey": 2343, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 27272.97d, "l_discount": 0.0d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-11-10", "l_commitdate": "1995-11-17", "l_receiptdate": "1995-12-10", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "old theodolites." }
-{ "l_orderkey": 2439, "l_partkey": 164, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2128.32d, "l_discount": 0.09d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-04-14", "l_commitdate": "1997-06-11", "l_receiptdate": "1997-05-09", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "courts boos" }
-{ "l_orderkey": 2469, "l_partkey": 166, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 11727.76d, "l_discount": 0.0d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-02-09", "l_commitdate": "1997-01-26", "l_receiptdate": "1997-02-16", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "ies wake carefully b" }
-{ "l_orderkey": 2592, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 6930.63d, "l_discount": 0.1d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-03-13", "l_commitdate": "1993-04-25", "l_receiptdate": "1993-04-01", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": " carefully special theodolites integrate " }
-{ "l_orderkey": 2625, "l_partkey": 20, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 38640.84d, "l_discount": 0.02d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-10-18", "l_commitdate": "1992-11-17", "l_receiptdate": "1992-10-23", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": " even accounts haggle furiously" }
-{ "l_orderkey": 2659, "l_partkey": 42, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 28, "l_extendedprice": 26377.12d, "l_discount": 0.08d, "l_tax": 0.05d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-03-17", "l_commitdate": "1994-01-24", "l_receiptdate": "1994-03-19", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "idle tithes" }
-{ "l_orderkey": 2689, "l_partkey": 6, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 40770.0d, "l_discount": 0.02d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-04-29", "l_commitdate": "1992-06-22", "l_receiptdate": "1992-04-30", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "e quickly. carefully silent" }
-{ "l_orderkey": 2690, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 45766.16d, "l_discount": 0.05d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-30", "l_commitdate": "1996-05-19", "l_receiptdate": "1996-06-26", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "ly alongside of th" }
-{ "l_orderkey": 2692, "l_partkey": 17, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 2751.03d, "l_discount": 0.1d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-02-25", "l_commitdate": "1998-01-29", "l_receiptdate": "1998-03-27", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "equests. bold, even foxes haggle slyl" }
-{ "l_orderkey": 2694, "l_partkey": 153, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 31594.5d, "l_discount": 0.02d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-06-20", "l_commitdate": "1996-06-01", "l_receiptdate": "1996-07-15", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "oxes. never iro" }
-{ "l_orderkey": 2759, "l_partkey": 59, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 10, "l_extendedprice": 9590.5d, "l_discount": 0.1d, "l_tax": 0.03d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-12-14", "l_commitdate": "1994-01-08", "l_receiptdate": "1994-01-01", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "s. busily ironic theodo" }
-{ "l_orderkey": 2819, "l_partkey": 70, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 17, "l_extendedprice": 16491.19d, "l_discount": 0.08d, "l_tax": 0.08d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-07-16", "l_commitdate": "1994-07-15", "l_receiptdate": "1994-07-17", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "en deposits above the f" }
-{ "l_orderkey": 2850, "l_partkey": 97, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 42874.87d, "l_discount": 0.02d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-11", "l_commitdate": "1996-11-03", "l_receiptdate": "1997-02-01", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "unusual accounts" }
-{ "l_orderkey": 2886, "l_partkey": 60, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 1, "l_extendedprice": 960.06d, "l_discount": 0.09d, "l_tax": 0.05d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-02-01", "l_commitdate": "1994-12-18", "l_receiptdate": "1995-02-28", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "eposits fr" }
-{ "l_orderkey": 2912, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 8176.96d, "l_discount": 0.06d, "l_tax": 0.04d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-04-09", "l_commitdate": "1992-04-19", "l_receiptdate": "1992-04-26", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "hs cajole over the slyl" }
-{ "l_orderkey": 2944, "l_partkey": 120, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 44885.28d, "l_discount": 0.08d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-25", "l_commitdate": "1997-10-28", "l_receiptdate": "1998-01-21", "l_shipinstruct": "COLLECT COD", "l_shipmode": "AIR", "l_comment": "ickly special theodolit" }
-{ "l_orderkey": 2947, "l_partkey": 10, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 33670.37d, "l_discount": 0.09d, "l_tax": 0.07d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-08-09", "l_commitdate": "1995-07-05", "l_receiptdate": "1995-08-20", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "RAIL", "l_comment": "e accounts: expres" }
-{ "l_orderkey": 2950, "l_partkey": 130, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 32, "l_extendedprice": 32964.16d, "l_discount": 0.01d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-09-21", "l_commitdate": "1997-08-25", "l_receiptdate": "1997-10-08", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "its wake carefully slyly final ideas." }
-{ "l_orderkey": 2978, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 28712.61d, "l_discount": 0.0d, "l_tax": 0.08d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-06-03", "l_commitdate": "1995-07-25", "l_receiptdate": "1995-06-06", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "ecial ideas promise slyly" }
-{ "l_orderkey": 3143, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 22, "l_extendedprice": 21781.98d, "l_discount": 0.02d, "l_tax": 0.0d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-05-11", "l_commitdate": "1993-03-26", "l_receiptdate": "1993-05-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "l, special instructions nag " }
-{ "l_orderkey": 3264, "l_partkey": 200, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 39, "l_extendedprice": 42907.8d, "l_discount": 0.06d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-11-07", "l_commitdate": "1996-12-12", "l_receiptdate": "1996-11-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "sleep carefully after the slyly final" }
-{ "l_orderkey": 3266, "l_partkey": 64, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 29885.86d, "l_discount": 0.09d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-06-19", "l_commitdate": "1995-05-04", "l_receiptdate": "1995-07-06", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "grate among the quickly express deposits" }
-{ "l_orderkey": 3270, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 10285.33d, "l_discount": 0.07d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-07-29", "l_commitdate": "1997-08-11", "l_receiptdate": "1997-08-05", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": " solve at the regular deposits. " }
-{ "l_orderkey": 3364, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 49, "l_extendedprice": 48514.41d, "l_discount": 0.03d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-09-17", "l_commitdate": "1997-08-23", "l_receiptdate": "1997-10-06", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "d accounts? caref" }
-{ "l_orderkey": 3366, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 3760.16d, "l_discount": 0.07d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-20", "l_commitdate": "1997-06-25", "l_receiptdate": "1997-06-03", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": " carefully about " }
-{ "l_orderkey": 3425, "l_partkey": 120, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 11221.32d, "l_discount": 0.03d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-04-24", "l_commitdate": "1996-05-29", "l_receiptdate": "1996-05-23", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "ckly final deposits use quickly?" }
-{ "l_orderkey": 3460, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 36440.4d, "l_discount": 0.1d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-28", "l_commitdate": "1995-12-14", "l_receiptdate": "1996-01-02", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "odolites are slyly bold deposits" }
-{ "l_orderkey": 3494, "l_partkey": 117, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 40684.4d, "l_discount": 0.05d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-07-10", "l_commitdate": "1993-06-01", "l_receiptdate": "1993-07-25", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "lites haggle furiously about the fin" }
-{ "l_orderkey": 3520, "l_partkey": 28, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 27840.6d, "l_discount": 0.04d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-11", "l_commitdate": "1997-10-02", "l_receiptdate": "1997-12-06", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "deas should solve blithely among the ironi" }
-{ "l_orderkey": 3559, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 28712.61d, "l_discount": 0.0d, "l_tax": 0.07d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-12-10", "l_commitdate": "1992-12-03", "l_receiptdate": "1992-12-20", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "l, regular accounts wake flu" }
-{ "l_orderkey": 3585, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 21, "l_extendedprice": 21464.52d, "l_discount": 0.05d, "l_tax": 0.04d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-12-04", "l_commitdate": "1994-12-25", "l_receiptdate": "1995-01-01", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "ounts use. express, final platelets us" }
-{ "l_orderkey": 3618, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 39525.32d, "l_discount": 0.08d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-22", "l_commitdate": "1998-02-23", "l_receiptdate": "1998-01-03", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "nts haggle fluffily above the regular " }
-{ "l_orderkey": 3715, "l_partkey": 97, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 13, "l_extendedprice": 12962.17d, "l_discount": 0.0d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-11", "l_commitdate": "1996-04-25", "l_receiptdate": "1996-06-09", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "e quickly ironic" }
-{ "l_orderkey": 3844, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2070.26d, "l_discount": 0.03d, "l_tax": 0.07d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1995-02-24", "l_commitdate": "1995-02-03", "l_receiptdate": "1995-03-18", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "es haggle final acco" }
-{ "l_orderkey": 3878, "l_partkey": 200, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 6, "l_extendedprice": 6601.2d, "l_discount": 0.07d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-21", "l_commitdate": "1997-05-22", "l_receiptdate": "1997-07-01", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "s. regular instru" }
-{ "l_orderkey": 3906, "l_partkey": 153, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 44232.3d, "l_discount": 0.0d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-09-03", "l_commitdate": "1992-07-22", "l_receiptdate": "1992-09-04", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "jole blithely after the furiously regular " }
-{ "l_orderkey": 3974, "l_partkey": 22, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 43334.94d, "l_discount": 0.1d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-06-03", "l_commitdate": "1996-05-08", "l_receiptdate": "1996-06-28", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "dencies above the re" }
-{ "l_orderkey": 4001, "l_partkey": 106, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 26, "l_extendedprice": 26158.6d, "l_discount": 0.0d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-07-26", "l_commitdate": "1997-06-18", "l_receiptdate": "1997-08-08", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "RAIL", "l_comment": "tegrate blithely" }
-{ "l_orderkey": 4005, "l_partkey": 4, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 26, "l_extendedprice": 23504.0d, "l_discount": 0.09d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-12-01", "l_commitdate": "1997-02-03", "l_receiptdate": "1996-12-15", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": " to the quic" }
-{ "l_orderkey": 4033, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 27272.97d, "l_discount": 0.01d, "l_tax": 0.04d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-08-08", "l_commitdate": "1993-08-14", "l_receiptdate": "1993-08-09", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "pinto beans" }
-{ "l_orderkey": 4034, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 48, "l_extendedprice": 52329.12d, "l_discount": 0.03d, "l_tax": 0.03d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-03-01", "l_commitdate": "1994-01-16", "l_receiptdate": "1994-03-16", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": " blithely regular requests play carefull" }
-{ "l_orderkey": 4036, "l_partkey": 6, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 46, "l_extendedprice": 41676.0d, "l_discount": 0.09d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-21", "l_commitdate": "1997-05-29", "l_receiptdate": "1997-07-18", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "usly across the even th" }
-{ "l_orderkey": 4064, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 3297.57d, "l_discount": 0.1d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-04", "l_commitdate": "1997-01-01", "l_receiptdate": "1997-01-23", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "its! quickly sp" }
-{ "l_orderkey": 4067, "l_partkey": 180, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 18, "l_extendedprice": 19443.24d, "l_discount": 0.03d, "l_tax": 0.08d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-01-24", "l_commitdate": "1992-12-23", "l_receiptdate": "1993-02-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": "e the slyly final packages d" }
-{ "l_orderkey": 4068, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 43434.73d, "l_discount": 0.05d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-11-28", "l_commitdate": "1996-11-16", "l_receiptdate": "1996-12-22", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "ructions. regular, special packag" }
-{ "l_orderkey": 4098, "l_partkey": 200, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 46, "l_extendedprice": 50609.2d, "l_discount": 0.07d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-26", "l_commitdate": "1997-01-27", "l_receiptdate": "1997-02-13", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "e slyly blithely silent deposits. fluff" }
-{ "l_orderkey": 4192, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 32796.36d, "l_discount": 0.06d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-04-25", "l_commitdate": "1998-05-26", "l_receiptdate": "1998-05-03", "l_shipinstruct": "COLLECT COD", "l_shipmode": "TRUCK", "l_comment": "eodolites sleep" }
-{ "l_orderkey": 4194, "l_partkey": 197, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 47179.17d, "l_discount": 0.08d, "l_tax": 0.06d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-11-06", "l_commitdate": "1994-12-09", "l_receiptdate": "1994-11-16", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "olites are after the exp" }
-{ "l_orderkey": 4261, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 12121.32d, "l_discount": 0.05d, "l_tax": 0.01d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-11-01", "l_commitdate": "1993-01-01", "l_receiptdate": "1992-11-12", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "into beans " }
-{ "l_orderkey": 4418, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 32, "l_extendedprice": 29920.96d, "l_discount": 0.02d, "l_tax": 0.06d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-05-28", "l_commitdate": "1993-06-02", "l_receiptdate": "1993-05-30", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ly. bold pinto b" }
-{ "l_orderkey": 4422, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 5, "l_extendedprice": 5175.65d, "l_discount": 0.09d, "l_tax": 0.07d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-07-17", "l_commitdate": "1995-08-13", "l_receiptdate": "1995-07-25", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "e furiously about t" }
-{ "l_orderkey": 4486, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 46, "l_extendedprice": 47615.98d, "l_discount": 0.08d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-05-02", "l_commitdate": "1998-04-05", "l_receiptdate": "1998-05-08", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "ackages. specia" }
-{ "l_orderkey": 4512, "l_partkey": 162, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 31864.8d, "l_discount": 0.07d, "l_tax": 0.07d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-28", "l_commitdate": "1995-12-22", "l_receiptdate": "1996-02-22", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "ly unusual package" }
-{ "l_orderkey": 4513, "l_partkey": 170, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 31034.93d, "l_discount": 0.03d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-18", "l_commitdate": "1996-05-23", "l_receiptdate": "1996-06-08", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "cajole. regular packages boost. s" }
-{ "l_orderkey": 4545, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 40780.46d, "l_discount": 0.06d, "l_tax": 0.06d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-01-27", "l_commitdate": "1993-03-01", "l_receiptdate": "1993-02-04", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "nts serve according to th" }
-{ "l_orderkey": 4549, "l_partkey": 159, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 46602.6d, "l_discount": 0.08d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-03-13", "l_commitdate": "1998-04-15", "l_receiptdate": "1998-03-27", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "ding to the regular, silent requests" }
-{ "l_orderkey": 4551, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 6, "l_extendedprice": 5466.06d, "l_discount": 0.08d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-18", "l_commitdate": "1996-04-23", "l_receiptdate": "1996-06-13", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "fily silent fo" }
-{ "l_orderkey": 4576, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 5, "l_extendedprice": 4950.45d, "l_discount": 0.09d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-08-23", "l_commitdate": "1996-11-08", "l_receiptdate": "1996-09-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "ly express, special asymptote" }
-{ "l_orderkey": 4608, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 32195.1d, "l_discount": 0.08d, "l_tax": 0.05d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-10-08", "l_commitdate": "1994-07-18", "l_receiptdate": "1994-10-25", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "s cajole. slyly " }
-{ "l_orderkey": 4641, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 49058.55d, "l_discount": 0.07d, "l_tax": 0.03d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-05-11", "l_commitdate": "1993-04-19", "l_receiptdate": "1993-05-21", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": " about the close " }
-{ "l_orderkey": 4679, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 7631.33d, "l_discount": 0.1d, "l_tax": 0.05d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-05-11", "l_commitdate": "1993-04-11", "l_receiptdate": "1993-05-16", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "kages. bold, regular packa" }
-{ "l_orderkey": 4769, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 16, "l_extendedprice": 14960.48d, "l_discount": 0.08d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-07-16", "l_commitdate": "1995-07-05", "l_receiptdate": "1995-07-22", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": " deposits. slyly even asymptote" }
-{ "l_orderkey": 4802, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 6, "l_extendedprice": 5640.24d, "l_discount": 0.0d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-04-16", "l_commitdate": "1997-03-25", "l_receiptdate": "1997-04-21", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "unusual accounts wake blithely. b" }
-{ "l_orderkey": 4804, "l_partkey": 128, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 45237.28d, "l_discount": 0.06d, "l_tax": 0.08d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-05-02", "l_commitdate": "1992-03-24", "l_receiptdate": "1992-05-28", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "aggle quickly among the slyly fi" }
-{ "l_orderkey": 4805, "l_partkey": 150, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 7351.05d, "l_discount": 0.09d, "l_tax": 0.03d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-05-01", "l_commitdate": "1992-07-09", "l_receiptdate": "1992-05-09", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": " requests. regular deposit" }
-{ "l_orderkey": 4807, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 9, "l_extendedprice": 9199.08d, "l_discount": 0.04d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-04-23", "l_commitdate": "1997-03-01", "l_receiptdate": "1997-05-15", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "may are blithely. carefully even pinto b" }
-{ "l_orderkey": 4836, "l_partkey": 162, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 22, "l_extendedprice": 23367.52d, "l_discount": 0.01d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-03", "l_commitdate": "1997-02-23", "l_receiptdate": "1997-03-04", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "al pinto beans. care" }
-{ "l_orderkey": 4837, "l_partkey": 42, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 16, "l_extendedprice": 15072.64d, "l_discount": 0.09d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-08-12", "l_commitdate": "1998-06-06", "l_receiptdate": "1998-08-26", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "ing requests are blithely regular instructi" }
-{ "l_orderkey": 4898, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 42771.08d, "l_discount": 0.07d, "l_tax": 0.02d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-09-13", "l_commitdate": "1994-08-18", "l_receiptdate": "1994-09-16", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "y regular grouches about" }
-{ "l_orderkey": 4928, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 4000.4d, "l_discount": 0.04d, "l_tax": 0.02d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-10-25", "l_commitdate": "1993-12-24", "l_receiptdate": "1993-11-16", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "bout the slyly final accounts. carefull" }
-{ "l_orderkey": 4929, "l_partkey": 14, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 20, "l_extendedprice": 18280.2d, "l_discount": 0.0d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-03-12", "l_commitdate": "1996-05-23", "l_receiptdate": "1996-03-20", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": " final pinto beans detect. final," }
-{ "l_orderkey": 4967, "l_partkey": 71, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 50, "l_extendedprice": 48553.5d, "l_discount": 0.07d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-27", "l_commitdate": "1997-05-13", "l_receiptdate": "1997-06-12", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "kages. final, unusual accounts c" }
-{ "l_orderkey": 4996, "l_partkey": 56, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 35, "l_extendedprice": 33461.75d, "l_discount": 0.07d, "l_tax": 0.01d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-10-30", "l_commitdate": "1992-10-27", "l_receiptdate": "1992-11-05", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "s. unusual, regular dolphins integrate care" }
-{ "l_orderkey": 5028, "l_partkey": 14, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 13710.15d, "l_discount": 0.07d, "l_tax": 0.07d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-07-17", "l_commitdate": "1992-07-16", "l_receiptdate": "1992-08-05", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "es are quickly final pains. furiously pend" }
-{ "l_orderkey": 5031, "l_partkey": 50, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 14250.75d, "l_discount": 0.02d, "l_tax": 0.05d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1995-04-01", "l_commitdate": "1995-02-24", "l_receiptdate": "1995-04-12", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "yly pending theodolites." }
-{ "l_orderkey": 5092, "l_partkey": 164, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 31924.8d, "l_discount": 0.06d, "l_tax": 0.0d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-27", "l_commitdate": "1995-12-08", "l_receiptdate": "1996-01-09", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "ss, ironic deposits. furiously stea" }
-{ "l_orderkey": 5153, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 39271.26d, "l_discount": 0.03d, "l_tax": 0.01d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-10-03", "l_commitdate": "1995-11-09", "l_receiptdate": "1995-10-11", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "re thinly. ironic" }
-{ "l_orderkey": 5154, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 11992.09d, "l_discount": 0.02d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-08-06", "l_commitdate": "1997-06-30", "l_receiptdate": "1997-09-04", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "luffily bold foxes. final" }
-{ "l_orderkey": 5185, "l_partkey": 197, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 40596.03d, "l_discount": 0.0d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-08-08", "l_commitdate": "1997-09-08", "l_receiptdate": "1997-08-14", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "gainst the courts dazzle care" }
-{ "l_orderkey": 5187, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 49, "l_extendedprice": 44639.49d, "l_discount": 0.04d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-10-20", "l_commitdate": "1997-10-12", "l_receiptdate": "1997-10-26", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "l, regular platelets instead of the foxes w" }
-{ "l_orderkey": 5190, "l_partkey": 56, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 41110.15d, "l_discount": 0.09d, "l_tax": 0.06d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-08-19", "l_commitdate": "1992-06-10", "l_receiptdate": "1992-09-01", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "encies use fluffily unusual requests? hoc" }
-{ "l_orderkey": 5217, "l_partkey": 80, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 50, "l_extendedprice": 49004.0d, "l_discount": 0.05d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-26", "l_commitdate": "1995-11-21", "l_receiptdate": "1996-01-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "s. express, express accounts c" }
-{ "l_orderkey": 5281, "l_partkey": 114, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 37522.07d, "l_discount": 0.05d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-11-10", "l_commitdate": "1996-01-31", "l_receiptdate": "1995-11-22", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "ronic dependencies. fluffily final p" }
-{ "l_orderkey": 5284, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 16, "l_extendedprice": 17170.72d, "l_discount": 0.04d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-08-17", "l_commitdate": "1995-08-23", "l_receiptdate": "1995-08-26", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "unts detect furiously even d" }
-{ "l_orderkey": 5286, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 1, "l_extendedprice": 1099.19d, "l_discount": 0.01d, "l_tax": 0.07d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-25", "l_commitdate": "1997-11-07", "l_receiptdate": "1997-12-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "ly! furiously final pack" }
-{ "l_orderkey": 5313, "l_partkey": 17, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 34, "l_extendedprice": 31178.34d, "l_discount": 0.1d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-08-07", "l_commitdate": "1997-08-12", "l_receiptdate": "1997-08-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "ccording to the blithely final account" }
-{ "l_orderkey": 5315, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 11220.36d, "l_discount": 0.08d, "l_tax": 0.06d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-12-18", "l_commitdate": "1993-01-16", "l_receiptdate": "1993-01-10", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "ccounts. furiously ironi" }
-{ "l_orderkey": 5316, "l_partkey": 108, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 29234.9d, "l_discount": 0.1d, "l_tax": 0.05d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-03-28", "l_commitdate": "1994-04-29", "l_receiptdate": "1994-04-09", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "ckly unusual foxes bo" }
-{ "l_orderkey": 5379, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 43967.6d, "l_discount": 0.01d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-10-01", "l_commitdate": "1995-10-19", "l_receiptdate": "1995-10-30", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "carefully final accounts haggle blithely. " }
-{ "l_orderkey": 5441, "l_partkey": 164, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 3192.48d, "l_discount": 0.0d, "l_tax": 0.02d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-08-12", "l_commitdate": "1994-10-14", "l_receiptdate": "1994-09-01", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "are. unusual, " }
-{ "l_orderkey": 5445, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 33, "l_extendedprice": 32672.97d, "l_discount": 0.08d, "l_tax": 0.07d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-10-21", "l_commitdate": "1993-10-14", "l_receiptdate": "1993-10-28", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "ests. final instructions" }
-{ "l_orderkey": 5446, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 29435.13d, "l_discount": 0.05d, "l_tax": 0.07d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-07-21", "l_commitdate": "1994-08-25", "l_receiptdate": "1994-08-17", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ously across the quic" }
-{ "l_orderkey": 5447, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 30971.79d, "l_discount": 0.09d, "l_tax": 0.03d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-14", "l_commitdate": "1996-05-07", "l_receiptdate": "1996-07-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": " foxes sleep. blithely unusual accounts det" }
-{ "l_orderkey": 5476, "l_partkey": 48, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 13, "l_extendedprice": 12324.52d, "l_discount": 0.01d, "l_tax": 0.04d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-27", "l_commitdate": "1997-12-08", "l_receiptdate": "1997-12-29", "l_shipinstruct": "COLLECT COD", "l_shipmode": "TRUCK", "l_comment": "iously special ac" }
-{ "l_orderkey": 5506, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2080.28d, "l_discount": 0.0d, "l_tax": 0.03d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-02-04", "l_commitdate": "1994-01-13", "l_receiptdate": "1994-02-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "onic theodolites are fluffil" }
-{ "l_orderkey": 5536, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 14, "l_extendedprice": 13861.26d, "l_discount": 0.08d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-05-18", "l_commitdate": "1998-05-08", "l_receiptdate": "1998-06-05", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "instructions sleep " }
-{ "l_orderkey": 5572, "l_partkey": 22, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 24, "l_extendedprice": 22128.48d, "l_discount": 0.08d, "l_tax": 0.08d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-10-30", "l_commitdate": "1994-10-02", "l_receiptdate": "1994-11-27", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "ests cajole. evenly ironic exc" }
-{ "l_orderkey": 5664, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 25, "l_extendedprice": 25553.0d, "l_discount": 0.0d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-10-29", "l_commitdate": "1998-09-23", "l_receiptdate": "1998-11-25", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "eposits: furiously ironic grouch" }
-{ "l_orderkey": 5670, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 26732.43d, "l_discount": 0.1d, "l_tax": 0.06d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-05-09", "l_commitdate": "1993-05-30", "l_receiptdate": "1993-06-06", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": " ideas promise bli" }
-{ "l_orderkey": 5728, "l_partkey": 44, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 44369.88d, "l_discount": 0.1d, "l_tax": 0.05d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-12-13", "l_commitdate": "1995-01-25", "l_receiptdate": "1994-12-25", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "nd the bravely final deposits. final ideas" }
-{ "l_orderkey": 5735, "l_partkey": 60, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 39362.46d, "l_discount": 0.01d, "l_tax": 0.01d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-23", "l_commitdate": "1995-02-10", "l_receiptdate": "1995-01-22", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "lthily ruthless i" }
-{ "l_orderkey": 5826, "l_partkey": 144, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 4176.56d, "l_discount": 0.03d, "l_tax": 0.06d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-07-31", "l_commitdate": "1998-09-10", "l_receiptdate": "1998-08-27", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": " packages across the fluffily spec" }
-{ "l_orderkey": 5829, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 3760.16d, "l_discount": 0.01d, "l_tax": 0.02d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-01", "l_commitdate": "1997-02-17", "l_receiptdate": "1997-03-22", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "ithely; accounts cajole ideas. regular foxe" }
-{ "l_orderkey": 5856, "l_partkey": 4, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 1, "l_extendedprice": 904.0d, "l_discount": 0.03d, "l_tax": 0.02d, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-12-29", "l_commitdate": "1995-01-07", "l_receiptdate": "1995-01-10", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "tly. special deposits wake blithely even" }
-{ "l_orderkey": 5926, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 7920.72d, "l_discount": 0.02d, "l_tax": 0.0d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-07-17", "l_commitdate": "1994-07-20", "l_receiptdate": "1994-08-11", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "gle furiously express foxes. bo" }
-{ "l_orderkey": 5927, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 43563.96d, "l_discount": 0.04d, "l_tax": 0.05d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-29", "l_commitdate": "1997-11-21", "l_receiptdate": "1997-12-13", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "rding to the special, final decoy" }
-{ "l_orderkey": 5955, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 14, "l_extendedprice": 14561.96d, "l_discount": 0.08d, "l_tax": 0.08d, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-06-22", "l_commitdate": "1995-05-23", "l_receiptdate": "1995-06-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": " unusual, bold theodolit" }
-{ "l_orderkey": 5959, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 49, "l_extendedprice": 50721.37d, "l_discount": 0.07d, "l_tax": 0.03d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-07-16", "l_commitdate": "1992-08-09", "l_receiptdate": "1992-08-14", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "usual packages haggle slyly pi" }
-{ "l_orderkey": 5988, "l_partkey": 172, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 43958.97d, "l_discount": 0.08d, "l_tax": 0.03d, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-01-20", "l_commitdate": "1994-02-06", "l_receiptdate": "1994-02-10", "l_shipinstruct": "COLLECT COD", "l_shipmode": "AIR", "l_comment": "the pending, express reque" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.adm
deleted file mode 100644
index 199ac15..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.adm
+++ /dev/null
@@ -1,167 +0,0 @@
-{ "l_orderkey": 36, "l_partkey": 120, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 42845.04, "l_discount": 0.09, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-03", "l_commitdate": "1996-01-21", "l_receiptdate": "1996-02-23", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": " careful courts. special " }
-{ "l_orderkey": 68, "l_partkey": 8, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 2724.0, "l_discount": 0.05, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-07-04", "l_commitdate": "1998-06-05", "l_receiptdate": "1998-07-21", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "fully special instructions cajole. furious" }
-{ "l_orderkey": 162, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2180.38, "l_discount": 0.02, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-09-02", "l_commitdate": "1995-06-17", "l_receiptdate": "1995-09-08", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "es! final somas integrate" }
-{ "l_orderkey": 192, "l_partkey": 98, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 23, "l_extendedprice": 22956.07, "l_discount": 0.0, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-02-05", "l_commitdate": "1998-02-06", "l_receiptdate": "1998-03-07", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "ly pending theodolites haggle quickly fluf" }
-{ "l_orderkey": 197, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 39, "l_extendedprice": 38964.51, "l_discount": 0.02, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-07-21", "l_commitdate": "1995-07-01", "l_receiptdate": "1995-08-14", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "press accounts. daringly sp" }
-{ "l_orderkey": 227, "l_partkey": 166, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 19, "l_extendedprice": 20257.04, "l_discount": 0.05, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-10", "l_commitdate": "1996-01-30", "l_receiptdate": "1995-12-26", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "s cajole furiously a" }
-{ "l_orderkey": 290, "l_partkey": 6, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 35, "l_extendedprice": 31710.0, "l_discount": 0.01, "l_tax": 0.02, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-04-01", "l_commitdate": "1994-02-05", "l_receiptdate": "1994-04-27", "l_shipinstruct": "NONE", "l_shipmode": "MAIL", "l_comment": "ove the final foxes detect slyly fluffily" }
-{ "l_orderkey": 325, "l_partkey": 159, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 34, "l_extendedprice": 36011.1, "l_discount": 0.09, "l_tax": 0.04, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-10-28", "l_commitdate": "1993-12-13", "l_receiptdate": "1993-11-17", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "ly bold deposits. always iron" }
-{ "l_orderkey": 355, "l_partkey": 114, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 31437.41, "l_discount": 0.09, "l_tax": 0.07, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-07-13", "l_commitdate": "1994-08-18", "l_receiptdate": "1994-07-18", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "y unusual, ironic" }
-{ "l_orderkey": 389, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2180.38, "l_discount": 0.09, "l_tax": 0.0, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-04-13", "l_commitdate": "1994-04-10", "l_receiptdate": "1994-04-25", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "fts. courts eat blithely even dependenc" }
-{ "l_orderkey": 391, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 14, "l_extendedprice": 14309.68, "l_discount": 0.09, "l_tax": 0.02, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1995-02-11", "l_commitdate": "1995-02-03", "l_receiptdate": "1995-02-13", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": " escapades sleep furiously about " }
-{ "l_orderkey": 417, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 39, "l_extendedprice": 36661.56, "l_discount": 0.01, "l_tax": 0.02, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-05-31", "l_commitdate": "1994-05-02", "l_receiptdate": "1994-06-06", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "y regular requests wake along " }
-{ "l_orderkey": 453, "l_partkey": 198, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 49418.55, "l_discount": 0.01, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-30", "l_commitdate": "1997-08-20", "l_receiptdate": "1997-07-19", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "ifts wake carefully." }
-{ "l_orderkey": 485, "l_partkey": 150, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 50, "l_extendedprice": 52507.5, "l_discount": 0.01, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-28", "l_commitdate": "1997-05-26", "l_receiptdate": "1997-04-18", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "iously quick excuses. carefully final f" }
-{ "l_orderkey": 545, "l_partkey": 170, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 4280.68, "l_discount": 0.02, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-23", "l_commitdate": "1995-12-16", "l_receiptdate": "1996-03-21", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": ", ironic grouches cajole over" }
-{ "l_orderkey": 581, "l_partkey": 64, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 39526.46, "l_discount": 0.09, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-26", "l_commitdate": "1997-04-06", "l_receiptdate": "1997-06-10", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "nts. quickly" }
-{ "l_orderkey": 647, "l_partkey": 17, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 37597.41, "l_discount": 0.08, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-19", "l_commitdate": "1997-09-24", "l_receiptdate": "1997-12-15", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "r instructions. quickly unusu" }
-{ "l_orderkey": 704, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 43607.6, "l_discount": 0.05, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-30", "l_commitdate": "1997-01-10", "l_receiptdate": "1997-02-20", "l_shipinstruct": "COLLECT COD", "l_shipmode": "AIR", "l_comment": "ggle quickly. r" }
-{ "l_orderkey": 738, "l_partkey": 198, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 34, "l_extendedprice": 37338.46, "l_discount": 0.0, "l_tax": 0.06, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-06-09", "l_commitdate": "1993-04-15", "l_receiptdate": "1993-07-09", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "s against the ironic exc" }
-{ "l_orderkey": 773, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 5, "l_extendedprice": 5000.5, "l_discount": 0.06, "l_tax": 0.04, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-11-21", "l_commitdate": "1993-12-19", "l_receiptdate": "1993-12-21", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "ar requests. regular, thin packages u" }
-{ "l_orderkey": 800, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 36938.66, "l_discount": 0.0, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-07-21", "l_commitdate": "1998-09-25", "l_receiptdate": "1998-08-07", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "according to the bold, final dependencies " }
-{ "l_orderkey": 900, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 48364.36, "l_discount": 0.01, "l_tax": 0.06, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-15", "l_commitdate": "1994-12-03", "l_receiptdate": "1994-12-27", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": " detect quick" }
-{ "l_orderkey": 931, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 18, "l_extendedprice": 16920.72, "l_discount": 0.0, "l_tax": 0.05, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-04-04", "l_commitdate": "1993-01-11", "l_receiptdate": "1993-04-13", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "slyly ironic re" }
-{ "l_orderkey": 932, "l_partkey": 44, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 38705.64, "l_discount": 0.01, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-05", "l_commitdate": "1997-07-22", "l_receiptdate": "1997-06-26", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "foxes. ironic pl" }
-{ "l_orderkey": 965, "l_partkey": 108, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 20, "l_extendedprice": 20162.0, "l_discount": 0.04, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "F", "l_shipdate": "1995-06-16", "l_commitdate": "1995-07-20", "l_receiptdate": "1995-07-06", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "kly. carefully pending requ" }
-{ "l_orderkey": 995, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 16097.55, "l_discount": 0.08, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-06-30", "l_commitdate": "1995-08-04", "l_receiptdate": "1995-07-27", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "uses. fluffily fina" }
-{ "l_orderkey": 1025, "l_partkey": 150, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 37805.4, "l_discount": 0.03, "l_tax": 0.04, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-05-15", "l_commitdate": "1995-07-05", "l_receiptdate": "1995-06-10", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "e unusual, regular instr" }
-{ "l_orderkey": 1027, "l_partkey": 156, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 45414.45, "l_discount": 0.07, "l_tax": 0.08, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-06-17", "l_commitdate": "1992-08-28", "l_receiptdate": "1992-07-10", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "oxes. carefully regular deposits" }
-{ "l_orderkey": 1155, "l_partkey": 70, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 3880.28, "l_discount": 0.09, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-10-19", "l_commitdate": "1997-12-09", "l_receiptdate": "1997-11-02", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "ic foxes according to the carefully final " }
-{ "l_orderkey": 1185, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 7776.56, "l_discount": 0.01, "l_tax": 0.06, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-12-05", "l_commitdate": "1992-10-05", "l_receiptdate": "1992-12-28", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "ely according to the furiously regular r" }
-{ "l_orderkey": 1216, "l_partkey": 97, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 7976.72, "l_discount": 0.03, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-02-01", "l_commitdate": "1993-03-06", "l_receiptdate": "1993-02-08", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": " of the carefully express" }
-{ "l_orderkey": 1223, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 28, "l_extendedprice": 28002.8, "l_discount": 0.1, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-08-07", "l_commitdate": "1996-07-24", "l_receiptdate": "1996-08-13", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": " quickly ironic requests. furious" }
-{ "l_orderkey": 1381, "l_partkey": 144, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 49074.58, "l_discount": 0.08, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-09-22", "l_commitdate": "1998-08-12", "l_receiptdate": "1998-10-12", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "ly ironic deposits" }
-{ "l_orderkey": 1409, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 23, "l_extendedprice": 22979.07, "l_discount": 0.01, "l_tax": 0.03, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-04-18", "l_commitdate": "1993-02-25", "l_receiptdate": "1993-05-06", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "ions. slyly ironic packages wake quick" }
-{ "l_orderkey": 1445, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 24, "l_extendedprice": 24002.4, "l_discount": 0.01, "l_tax": 0.0, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-02-21", "l_commitdate": "1995-02-22", "l_receiptdate": "1995-03-18", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "al accounts use furiously a" }
-{ "l_orderkey": 1477, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 30134.17, "l_discount": 0.0, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-16", "l_commitdate": "1997-09-30", "l_receiptdate": "1997-12-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": " requests. fluffily final " }
-{ "l_orderkey": 1540, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 40780.46, "l_discount": 0.03, "l_tax": 0.01, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-09-30", "l_commitdate": "1992-10-27", "l_receiptdate": "1992-10-12", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": " final grouches bo" }
-{ "l_orderkey": 1568, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 35643.24, "l_discount": 0.02, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-31", "l_commitdate": "1997-04-22", "l_receiptdate": "1997-06-21", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "platelets-- furiously sly excu" }
-{ "l_orderkey": 1605, "l_partkey": 142, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 48980.58, "l_discount": 0.0, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-04-29", "l_commitdate": "1998-06-12", "l_receiptdate": "1998-05-20", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": ". carefully r" }
-{ "l_orderkey": 1607, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2180.38, "l_discount": 0.02, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-11", "l_commitdate": "1996-02-15", "l_receiptdate": "1996-01-19", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "packages haggle. regular requests boost s" }
-{ "l_orderkey": 1635, "l_partkey": 71, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 2913.21, "l_discount": 0.06, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-13", "l_commitdate": "1997-03-25", "l_receiptdate": "1997-03-27", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": " quickly ironic r" }
-{ "l_orderkey": 1700, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 39525.32, "l_discount": 0.04, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-10-03", "l_commitdate": "1996-07-27", "l_receiptdate": "1996-10-22", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "ular dependencies engage slyly " }
-{ "l_orderkey": 1796, "l_partkey": 10, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 28, "l_extendedprice": 25480.28, "l_discount": 0.08, "l_tax": 0.04, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-12-01", "l_commitdate": "1993-01-01", "l_receiptdate": "1992-12-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "y quickly ironic accounts." }
-{ "l_orderkey": 1825, "l_partkey": 156, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 45414.45, "l_discount": 0.05, "l_tax": 0.05, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-02-18", "l_commitdate": "1994-02-19", "l_receiptdate": "1994-03-02", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": " accounts breach fluffily spe" }
-{ "l_orderkey": 1827, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 46534.23, "l_discount": 0.0, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-08-01", "l_commitdate": "1996-08-07", "l_receiptdate": "1996-08-23", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": ". pending courts about the even e" }
-{ "l_orderkey": 1893, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 42960.87, "l_discount": 0.1, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-01-25", "l_commitdate": "1998-01-06", "l_receiptdate": "1998-02-14", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "he carefully regular " }
-{ "l_orderkey": 1924, "l_partkey": 73, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 6811.49, "l_discount": 0.06, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-01", "l_commitdate": "1996-12-02", "l_receiptdate": "1997-01-08", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "osits. even accounts nag furious" }
-{ "l_orderkey": 1953, "l_partkey": 128, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 25, "l_extendedprice": 25703.0, "l_discount": 0.07, "l_tax": 0.06, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-01-07", "l_commitdate": "1994-01-28", "l_receiptdate": "1994-01-29", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ular, regular i" }
-{ "l_orderkey": 1985, "l_partkey": 28, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 33, "l_extendedprice": 30624.66, "l_discount": 0.1, "l_tax": 0.03, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-04", "l_commitdate": "1994-11-01", "l_receiptdate": "1994-12-05", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "s are express packages. pendin" }
-{ "l_orderkey": 1988, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 34994.52, "l_discount": 0.09, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-21", "l_commitdate": "1995-11-24", "l_receiptdate": "1996-01-27", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "gular theodolites. " }
-{ "l_orderkey": 2048, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 6545.21, "l_discount": 0.06, "l_tax": 0.01, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-12-07", "l_commitdate": "1994-01-31", "l_receiptdate": "1994-01-05", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "lent platelets boost deposits. carefully sp" }
-{ "l_orderkey": 2086, "l_partkey": 60, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 22, "l_extendedprice": 21121.32, "l_discount": 0.03, "l_tax": 0.07, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-04", "l_commitdate": "1994-12-16", "l_receiptdate": "1994-12-20", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "RAIL", "l_comment": "idly busy acc" }
-{ "l_orderkey": 2118, "l_partkey": 160, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 24, "l_extendedprice": 25443.84, "l_discount": 0.1, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-06", "l_commitdate": "1996-12-14", "l_receiptdate": "1997-01-14", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "about the slyly bold depende" }
-{ "l_orderkey": 2183, "l_partkey": 71, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 28161.03, "l_discount": 0.05, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-21", "l_commitdate": "1996-08-24", "l_receiptdate": "1996-08-15", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ly unusual deposits sleep carefully" }
-{ "l_orderkey": 2211, "l_partkey": 48, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 25, "l_extendedprice": 23701.0, "l_discount": 0.04, "l_tax": 0.01, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-10-09", "l_commitdate": "1994-08-04", "l_receiptdate": "1994-11-03", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "deas. carefully special theodolites along" }
-{ "l_orderkey": 2215, "l_partkey": 73, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 33, "l_extendedprice": 32111.31, "l_discount": 0.0, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-19", "l_commitdate": "1996-08-10", "l_receiptdate": "1996-07-30", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "dolites cajole b" }
-{ "l_orderkey": 2272, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 18, "l_extendedprice": 17821.62, "l_discount": 0.04, "l_tax": 0.0, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-08-01", "l_commitdate": "1993-07-06", "l_receiptdate": "1993-08-25", "l_shipinstruct": "NONE", "l_shipmode": "MAIL", "l_comment": "ons along the blithely e" }
-{ "l_orderkey": 2342, "l_partkey": 42, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 11304.48, "l_discount": 0.0, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-31", "l_commitdate": "1996-07-26", "l_receiptdate": "1996-08-14", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "print blithely even deposits. carefull" }
-{ "l_orderkey": 2343, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 27272.97, "l_discount": 0.0, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-11-10", "l_commitdate": "1995-11-17", "l_receiptdate": "1995-12-10", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "old theodolites." }
-{ "l_orderkey": 2439, "l_partkey": 164, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2128.32, "l_discount": 0.09, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-04-14", "l_commitdate": "1997-06-11", "l_receiptdate": "1997-05-09", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "courts boos" }
-{ "l_orderkey": 2469, "l_partkey": 166, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 11727.76, "l_discount": 0.0, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-02-09", "l_commitdate": "1997-01-26", "l_receiptdate": "1997-02-16", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "ies wake carefully b" }
-{ "l_orderkey": 2592, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 6930.63, "l_discount": 0.1, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-03-13", "l_commitdate": "1993-04-25", "l_receiptdate": "1993-04-01", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": " carefully special theodolites integrate " }
-{ "l_orderkey": 2625, "l_partkey": 20, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 38640.84, "l_discount": 0.02, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-10-18", "l_commitdate": "1992-11-17", "l_receiptdate": "1992-10-23", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": " even accounts haggle furiously" }
-{ "l_orderkey": 2659, "l_partkey": 42, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 28, "l_extendedprice": 26377.12, "l_discount": 0.08, "l_tax": 0.05, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-03-17", "l_commitdate": "1994-01-24", "l_receiptdate": "1994-03-19", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "idle tithes" }
-{ "l_orderkey": 2689, "l_partkey": 6, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 40770.0, "l_discount": 0.02, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-04-29", "l_commitdate": "1992-06-22", "l_receiptdate": "1992-04-30", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "e quickly. carefully silent" }
-{ "l_orderkey": 2690, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 45766.16, "l_discount": 0.05, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-30", "l_commitdate": "1996-05-19", "l_receiptdate": "1996-06-26", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "ly alongside of th" }
-{ "l_orderkey": 2692, "l_partkey": 17, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 2751.03, "l_discount": 0.1, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-02-25", "l_commitdate": "1998-01-29", "l_receiptdate": "1998-03-27", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "equests. bold, even foxes haggle slyl" }
-{ "l_orderkey": 2694, "l_partkey": 153, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 31594.5, "l_discount": 0.02, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-06-20", "l_commitdate": "1996-06-01", "l_receiptdate": "1996-07-15", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "oxes. never iro" }
-{ "l_orderkey": 2759, "l_partkey": 59, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 10, "l_extendedprice": 9590.5, "l_discount": 0.1, "l_tax": 0.03, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-12-14", "l_commitdate": "1994-01-08", "l_receiptdate": "1994-01-01", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "s. busily ironic theodo" }
-{ "l_orderkey": 2819, "l_partkey": 70, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 17, "l_extendedprice": 16491.19, "l_discount": 0.08, "l_tax": 0.08, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-07-16", "l_commitdate": "1994-07-15", "l_receiptdate": "1994-07-17", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "en deposits above the f" }
-{ "l_orderkey": 2850, "l_partkey": 97, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 42874.87, "l_discount": 0.02, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-11", "l_commitdate": "1996-11-03", "l_receiptdate": "1997-02-01", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "unusual accounts" }
-{ "l_orderkey": 2886, "l_partkey": 60, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 1, "l_extendedprice": 960.06, "l_discount": 0.09, "l_tax": 0.05, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-02-01", "l_commitdate": "1994-12-18", "l_receiptdate": "1995-02-28", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "eposits fr" }
-{ "l_orderkey": 2912, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 8176.96, "l_discount": 0.06, "l_tax": 0.04, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-04-09", "l_commitdate": "1992-04-19", "l_receiptdate": "1992-04-26", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "hs cajole over the slyl" }
-{ "l_orderkey": 2944, "l_partkey": 120, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 44885.28, "l_discount": 0.08, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-25", "l_commitdate": "1997-10-28", "l_receiptdate": "1998-01-21", "l_shipinstruct": "COLLECT COD", "l_shipmode": "AIR", "l_comment": "ickly special theodolit" }
-{ "l_orderkey": 2947, "l_partkey": 10, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 33670.37, "l_discount": 0.09, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-08-09", "l_commitdate": "1995-07-05", "l_receiptdate": "1995-08-20", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "RAIL", "l_comment": "e accounts: expres" }
-{ "l_orderkey": 2950, "l_partkey": 130, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 32, "l_extendedprice": 32964.16, "l_discount": 0.01, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-09-21", "l_commitdate": "1997-08-25", "l_receiptdate": "1997-10-08", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "its wake carefully slyly final ideas." }
-{ "l_orderkey": 2978, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 28712.61, "l_discount": 0.0, "l_tax": 0.08, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1995-06-03", "l_commitdate": "1995-07-25", "l_receiptdate": "1995-06-06", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "ecial ideas promise slyly" }
-{ "l_orderkey": 3143, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 22, "l_extendedprice": 21781.98, "l_discount": 0.02, "l_tax": 0.0, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-05-11", "l_commitdate": "1993-03-26", "l_receiptdate": "1993-05-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "l, special instructions nag " }
-{ "l_orderkey": 3264, "l_partkey": 200, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 39, "l_extendedprice": 42907.8, "l_discount": 0.06, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-11-07", "l_commitdate": "1996-12-12", "l_receiptdate": "1996-11-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "sleep carefully after the slyly final" }
-{ "l_orderkey": 3266, "l_partkey": 64, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 29885.86, "l_discount": 0.09, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-06-19", "l_commitdate": "1995-05-04", "l_receiptdate": "1995-07-06", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "grate among the quickly express deposits" }
-{ "l_orderkey": 3270, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 10285.33, "l_discount": 0.07, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-07-29", "l_commitdate": "1997-08-11", "l_receiptdate": "1997-08-05", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": " solve at the regular deposits. " }
-{ "l_orderkey": 3364, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 49, "l_extendedprice": 48514.41, "l_discount": 0.03, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-09-17", "l_commitdate": "1997-08-23", "l_receiptdate": "1997-10-06", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "d accounts? caref" }
-{ "l_orderkey": 3366, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 3760.16, "l_discount": 0.07, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-20", "l_commitdate": "1997-06-25", "l_receiptdate": "1997-06-03", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": " carefully about " }
-{ "l_orderkey": 3425, "l_partkey": 120, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 11221.32, "l_discount": 0.03, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-04-24", "l_commitdate": "1996-05-29", "l_receiptdate": "1996-05-23", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "ckly final deposits use quickly?" }
-{ "l_orderkey": 3460, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 36440.4, "l_discount": 0.1, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-28", "l_commitdate": "1995-12-14", "l_receiptdate": "1996-01-02", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "odolites are slyly bold deposits" }
-{ "l_orderkey": 3494, "l_partkey": 117, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 40684.4, "l_discount": 0.05, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-07-10", "l_commitdate": "1993-06-01", "l_receiptdate": "1993-07-25", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "lites haggle furiously about the fin" }
-{ "l_orderkey": 3520, "l_partkey": 28, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 27840.6, "l_discount": 0.04, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-11", "l_commitdate": "1997-10-02", "l_receiptdate": "1997-12-06", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "deas should solve blithely among the ironi" }
-{ "l_orderkey": 3559, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 28712.61, "l_discount": 0.0, "l_tax": 0.07, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-12-10", "l_commitdate": "1992-12-03", "l_receiptdate": "1992-12-20", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "l, regular accounts wake flu" }
-{ "l_orderkey": 3585, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 21, "l_extendedprice": 21464.52, "l_discount": 0.05, "l_tax": 0.04, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-12-04", "l_commitdate": "1994-12-25", "l_receiptdate": "1995-01-01", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "ounts use. express, final platelets us" }
-{ "l_orderkey": 3618, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 39525.32, "l_discount": 0.08, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-22", "l_commitdate": "1998-02-23", "l_receiptdate": "1998-01-03", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "nts haggle fluffily above the regular " }
-{ "l_orderkey": 3715, "l_partkey": 97, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 13, "l_extendedprice": 12962.17, "l_discount": 0.0, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-11", "l_commitdate": "1996-04-25", "l_receiptdate": "1996-06-09", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "e quickly ironic" }
-{ "l_orderkey": 3844, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2070.26, "l_discount": 0.03, "l_tax": 0.07, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1995-02-24", "l_commitdate": "1995-02-03", "l_receiptdate": "1995-03-18", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "es haggle final acco" }
-{ "l_orderkey": 3878, "l_partkey": 200, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 6, "l_extendedprice": 6601.2, "l_discount": 0.07, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-21", "l_commitdate": "1997-05-22", "l_receiptdate": "1997-07-01", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "s. regular instru" }
-{ "l_orderkey": 3906, "l_partkey": 153, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 44232.3, "l_discount": 0.0, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-09-03", "l_commitdate": "1992-07-22", "l_receiptdate": "1992-09-04", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "jole blithely after the furiously regular " }
-{ "l_orderkey": 3974, "l_partkey": 22, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 43334.94, "l_discount": 0.1, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-06-03", "l_commitdate": "1996-05-08", "l_receiptdate": "1996-06-28", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "dencies above the re" }
-{ "l_orderkey": 4001, "l_partkey": 106, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 26, "l_extendedprice": 26158.6, "l_discount": 0.0, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-07-26", "l_commitdate": "1997-06-18", "l_receiptdate": "1997-08-08", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "RAIL", "l_comment": "tegrate blithely" }
-{ "l_orderkey": 4005, "l_partkey": 4, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 26, "l_extendedprice": 23504.0, "l_discount": 0.09, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-12-01", "l_commitdate": "1997-02-03", "l_receiptdate": "1996-12-15", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": " to the quic" }
-{ "l_orderkey": 4033, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 27272.97, "l_discount": 0.01, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-08-08", "l_commitdate": "1993-08-14", "l_receiptdate": "1993-08-09", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "pinto beans" }
-{ "l_orderkey": 4034, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 48, "l_extendedprice": 52329.12, "l_discount": 0.03, "l_tax": 0.03, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-03-01", "l_commitdate": "1994-01-16", "l_receiptdate": "1994-03-16", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": " blithely regular requests play carefull" }
-{ "l_orderkey": 4036, "l_partkey": 6, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 46, "l_extendedprice": 41676.0, "l_discount": 0.09, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-06-21", "l_commitdate": "1997-05-29", "l_receiptdate": "1997-07-18", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "usly across the even th" }
-{ "l_orderkey": 4064, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 3297.57, "l_discount": 0.1, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-04", "l_commitdate": "1997-01-01", "l_receiptdate": "1997-01-23", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "its! quickly sp" }
-{ "l_orderkey": 4067, "l_partkey": 180, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 18, "l_extendedprice": 19443.24, "l_discount": 0.03, "l_tax": 0.08, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-01-24", "l_commitdate": "1992-12-23", "l_receiptdate": "1993-02-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": "e the slyly final packages d" }
-{ "l_orderkey": 4068, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 43434.73, "l_discount": 0.05, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-11-28", "l_commitdate": "1996-11-16", "l_receiptdate": "1996-12-22", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "ructions. regular, special packag" }
-{ "l_orderkey": 4098, "l_partkey": 200, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 46, "l_extendedprice": 50609.2, "l_discount": 0.07, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-26", "l_commitdate": "1997-01-27", "l_receiptdate": "1997-02-13", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "e slyly blithely silent deposits. fluff" }
-{ "l_orderkey": 4192, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 36, "l_extendedprice": 32796.36, "l_discount": 0.06, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-04-25", "l_commitdate": "1998-05-26", "l_receiptdate": "1998-05-03", "l_shipinstruct": "COLLECT COD", "l_shipmode": "TRUCK", "l_comment": "eodolites sleep" }
-{ "l_orderkey": 4194, "l_partkey": 197, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 47179.17, "l_discount": 0.08, "l_tax": 0.06, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-11-06", "l_commitdate": "1994-12-09", "l_receiptdate": "1994-11-16", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "olites are after the exp" }
-{ "l_orderkey": 4261, "l_partkey": 110, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 12121.32, "l_discount": 0.05, "l_tax": 0.01, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-11-01", "l_commitdate": "1993-01-01", "l_receiptdate": "1992-11-12", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "into beans " }
-{ "l_orderkey": 4418, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 32, "l_extendedprice": 29920.96, "l_discount": 0.02, "l_tax": 0.06, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-05-28", "l_commitdate": "1993-06-02", "l_receiptdate": "1993-05-30", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ly. bold pinto b" }
-{ "l_orderkey": 4422, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 5, "l_extendedprice": 5175.65, "l_discount": 0.09, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-07-17", "l_commitdate": "1995-08-13", "l_receiptdate": "1995-07-25", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "e furiously about t" }
-{ "l_orderkey": 4486, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 46, "l_extendedprice": 47615.98, "l_discount": 0.08, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-05-02", "l_commitdate": "1998-04-05", "l_receiptdate": "1998-05-08", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "ackages. specia" }
-{ "l_orderkey": 4512, "l_partkey": 162, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 31864.8, "l_discount": 0.07, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-28", "l_commitdate": "1995-12-22", "l_receiptdate": "1996-02-22", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "ly unusual package" }
-{ "l_orderkey": 4513, "l_partkey": 170, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 31034.93, "l_discount": 0.03, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-18", "l_commitdate": "1996-05-23", "l_receiptdate": "1996-06-08", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "cajole. regular packages boost. s" }
-{ "l_orderkey": 4545, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 40780.46, "l_discount": 0.06, "l_tax": 0.06, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-01-27", "l_commitdate": "1993-03-01", "l_receiptdate": "1993-02-04", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "nts serve according to th" }
-{ "l_orderkey": 4549, "l_partkey": 159, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 46602.6, "l_discount": 0.08, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-03-13", "l_commitdate": "1998-04-15", "l_receiptdate": "1998-03-27", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "ding to the regular, silent requests" }
-{ "l_orderkey": 4551, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 6, "l_extendedprice": 5466.06, "l_discount": 0.08, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-18", "l_commitdate": "1996-04-23", "l_receiptdate": "1996-06-13", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "fily silent fo" }
-{ "l_orderkey": 4576, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 5, "l_extendedprice": 4950.45, "l_discount": 0.09, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-08-23", "l_commitdate": "1996-11-08", "l_receiptdate": "1996-09-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "ly express, special asymptote" }
-{ "l_orderkey": 4608, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 32195.1, "l_discount": 0.08, "l_tax": 0.05, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-10-08", "l_commitdate": "1994-07-18", "l_receiptdate": "1994-10-25", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "s cajole. slyly " }
-{ "l_orderkey": 4641, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 49058.55, "l_discount": 0.07, "l_tax": 0.03, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-05-11", "l_commitdate": "1993-04-19", "l_receiptdate": "1993-05-21", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": " about the close " }
-{ "l_orderkey": 4679, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 7631.33, "l_discount": 0.1, "l_tax": 0.05, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-05-11", "l_commitdate": "1993-04-11", "l_receiptdate": "1993-05-16", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "kages. bold, regular packa" }
-{ "l_orderkey": 4769, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 16, "l_extendedprice": 14960.48, "l_discount": 0.08, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-07-16", "l_commitdate": "1995-07-05", "l_receiptdate": "1995-07-22", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": " deposits. slyly even asymptote" }
-{ "l_orderkey": 4802, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 6, "l_extendedprice": 5640.24, "l_discount": 0.0, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-04-16", "l_commitdate": "1997-03-25", "l_receiptdate": "1997-04-21", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "unusual accounts wake blithely. b" }
-{ "l_orderkey": 4804, "l_partkey": 128, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 45237.28, "l_discount": 0.06, "l_tax": 0.08, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-05-02", "l_commitdate": "1992-03-24", "l_receiptdate": "1992-05-28", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "AIR", "l_comment": "aggle quickly among the slyly fi" }
-{ "l_orderkey": 4805, "l_partkey": 150, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 7, "l_extendedprice": 7351.05, "l_discount": 0.09, "l_tax": 0.03, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-05-01", "l_commitdate": "1992-07-09", "l_receiptdate": "1992-05-09", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": " requests. regular deposit" }
-{ "l_orderkey": 4807, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 9, "l_extendedprice": 9199.08, "l_discount": 0.04, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-04-23", "l_commitdate": "1997-03-01", "l_receiptdate": "1997-05-15", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "may are blithely. carefully even pinto b" }
-{ "l_orderkey": 4836, "l_partkey": 162, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 22, "l_extendedprice": 23367.52, "l_discount": 0.01, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-03", "l_commitdate": "1997-02-23", "l_receiptdate": "1997-03-04", "l_shipinstruct": "NONE", "l_shipmode": "SHIP", "l_comment": "al pinto beans. care" }
-{ "l_orderkey": 4837, "l_partkey": 42, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 16, "l_extendedprice": 15072.64, "l_discount": 0.09, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-08-12", "l_commitdate": "1998-06-06", "l_receiptdate": "1998-08-26", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "ing requests are blithely regular instructi" }
-{ "l_orderkey": 4898, "l_partkey": 72, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 42771.08, "l_discount": 0.07, "l_tax": 0.02, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-09-13", "l_commitdate": "1994-08-18", "l_receiptdate": "1994-09-16", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "y regular grouches about" }
-{ "l_orderkey": 4928, "l_partkey": 100, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 4000.4, "l_discount": 0.04, "l_tax": 0.02, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-10-25", "l_commitdate": "1993-12-24", "l_receiptdate": "1993-11-16", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "bout the slyly final accounts. carefull" }
-{ "l_orderkey": 4929, "l_partkey": 14, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 20, "l_extendedprice": 18280.2, "l_discount": 0.0, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-03-12", "l_commitdate": "1996-05-23", "l_receiptdate": "1996-03-20", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": " final pinto beans detect. final," }
-{ "l_orderkey": 4967, "l_partkey": 71, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 50, "l_extendedprice": 48553.5, "l_discount": 0.07, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-05-27", "l_commitdate": "1997-05-13", "l_receiptdate": "1997-06-12", "l_shipinstruct": "NONE", "l_shipmode": "REG AIR", "l_comment": "kages. final, unusual accounts c" }
-{ "l_orderkey": 4996, "l_partkey": 56, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 35, "l_extendedprice": 33461.75, "l_discount": 0.07, "l_tax": 0.01, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-10-30", "l_commitdate": "1992-10-27", "l_receiptdate": "1992-11-05", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "s. unusual, regular dolphins integrate care" }
-{ "l_orderkey": 5028, "l_partkey": 14, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 13710.15, "l_discount": 0.07, "l_tax": 0.07, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-07-17", "l_commitdate": "1992-07-16", "l_receiptdate": "1992-08-05", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "es are quickly final pains. furiously pend" }
-{ "l_orderkey": 5031, "l_partkey": 50, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 14250.75, "l_discount": 0.02, "l_tax": 0.05, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1995-04-01", "l_commitdate": "1995-02-24", "l_receiptdate": "1995-04-12", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "yly pending theodolites." }
-{ "l_orderkey": 5092, "l_partkey": 164, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 31924.8, "l_discount": 0.06, "l_tax": 0.0, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-27", "l_commitdate": "1995-12-08", "l_receiptdate": "1996-01-09", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "ss, ironic deposits. furiously stea" }
-{ "l_orderkey": 5153, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 42, "l_extendedprice": 39271.26, "l_discount": 0.03, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-10-03", "l_commitdate": "1995-11-09", "l_receiptdate": "1995-10-11", "l_shipinstruct": "COLLECT COD", "l_shipmode": "RAIL", "l_comment": "re thinly. ironic" }
-{ "l_orderkey": 5154, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 11, "l_extendedprice": 11992.09, "l_discount": 0.02, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-08-06", "l_commitdate": "1997-06-30", "l_receiptdate": "1997-09-04", "l_shipinstruct": "NONE", "l_shipmode": "RAIL", "l_comment": "luffily bold foxes. final" }
-{ "l_orderkey": 5185, "l_partkey": 197, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 40596.03, "l_discount": 0.0, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-08-08", "l_commitdate": "1997-09-08", "l_receiptdate": "1997-08-14", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": "gainst the courts dazzle care" }
-{ "l_orderkey": 5187, "l_partkey": 11, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 49, "l_extendedprice": 44639.49, "l_discount": 0.04, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-10-20", "l_commitdate": "1997-10-12", "l_receiptdate": "1997-10-26", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "l, regular platelets instead of the foxes w" }
-{ "l_orderkey": 5190, "l_partkey": 56, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 43, "l_extendedprice": 41110.15, "l_discount": 0.09, "l_tax": 0.06, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-08-19", "l_commitdate": "1992-06-10", "l_receiptdate": "1992-09-01", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "encies use fluffily unusual requests? hoc" }
-{ "l_orderkey": 5217, "l_partkey": 80, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 50, "l_extendedprice": 49004.0, "l_discount": 0.05, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-12-26", "l_commitdate": "1995-11-21", "l_receiptdate": "1996-01-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "s. express, express accounts c" }
-{ "l_orderkey": 5281, "l_partkey": 114, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 37522.07, "l_discount": 0.05, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-11-10", "l_commitdate": "1996-01-31", "l_receiptdate": "1995-11-22", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "ronic dependencies. fluffily final p" }
-{ "l_orderkey": 5284, "l_partkey": 173, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 16, "l_extendedprice": 17170.72, "l_discount": 0.04, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-08-17", "l_commitdate": "1995-08-23", "l_receiptdate": "1995-08-26", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "unts detect furiously even d" }
-{ "l_orderkey": 5286, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 1, "l_extendedprice": 1099.19, "l_discount": 0.01, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-25", "l_commitdate": "1997-11-07", "l_receiptdate": "1997-12-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "REG AIR", "l_comment": "ly! furiously final pack" }
-{ "l_orderkey": 5313, "l_partkey": 17, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 34, "l_extendedprice": 31178.34, "l_discount": 0.1, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-08-07", "l_commitdate": "1997-08-12", "l_receiptdate": "1997-08-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "FOB", "l_comment": "ccording to the blithely final account" }
-{ "l_orderkey": 5315, "l_partkey": 35, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 11220.36, "l_discount": 0.08, "l_tax": 0.06, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-12-18", "l_commitdate": "1993-01-16", "l_receiptdate": "1993-01-10", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "ccounts. furiously ironi" }
-{ "l_orderkey": 5316, "l_partkey": 108, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 29, "l_extendedprice": 29234.9, "l_discount": 0.1, "l_tax": 0.05, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-03-28", "l_commitdate": "1994-04-29", "l_receiptdate": "1994-04-09", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "ckly unusual foxes bo" }
-{ "l_orderkey": 5379, "l_partkey": 199, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 40, "l_extendedprice": 43967.6, "l_discount": 0.01, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-10-01", "l_commitdate": "1995-10-19", "l_receiptdate": "1995-10-30", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "carefully final accounts haggle blithely. " }
-{ "l_orderkey": 5441, "l_partkey": 164, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 3, "l_extendedprice": 3192.48, "l_discount": 0.0, "l_tax": 0.02, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-08-12", "l_commitdate": "1994-10-14", "l_receiptdate": "1994-09-01", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "are. unusual, " }
-{ "l_orderkey": 5445, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 33, "l_extendedprice": 32672.97, "l_discount": 0.08, "l_tax": 0.07, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-10-21", "l_commitdate": "1993-10-14", "l_receiptdate": "1993-10-28", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "ests. final instructions" }
-{ "l_orderkey": 5446, "l_partkey": 190, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 29435.13, "l_discount": 0.05, "l_tax": 0.07, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-07-21", "l_commitdate": "1994-08-25", "l_receiptdate": "1994-08-17", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ously across the quic" }
-{ "l_orderkey": 5447, "l_partkey": 99, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 31, "l_extendedprice": 30971.79, "l_discount": 0.09, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-07-14", "l_commitdate": "1996-05-07", "l_receiptdate": "1996-07-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "SHIP", "l_comment": " foxes sleep. blithely unusual accounts det" }
-{ "l_orderkey": 5476, "l_partkey": 48, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 13, "l_extendedprice": 12324.52, "l_discount": 0.01, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-12-27", "l_commitdate": "1997-12-08", "l_receiptdate": "1997-12-29", "l_shipinstruct": "COLLECT COD", "l_shipmode": "TRUCK", "l_comment": "iously special ac" }
-{ "l_orderkey": 5506, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 2, "l_extendedprice": 2080.28, "l_discount": 0.0, "l_tax": 0.03, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-02-04", "l_commitdate": "1994-01-13", "l_receiptdate": "1994-02-17", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "onic theodolites are fluffil" }
-{ "l_orderkey": 5536, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 14, "l_extendedprice": 13861.26, "l_discount": 0.08, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-05-18", "l_commitdate": "1998-05-08", "l_receiptdate": "1998-06-05", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "instructions sleep " }
-{ "l_orderkey": 5572, "l_partkey": 22, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 24, "l_extendedprice": 22128.48, "l_discount": 0.08, "l_tax": 0.08, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-10-30", "l_commitdate": "1994-10-02", "l_receiptdate": "1994-11-27", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "ests cajole. evenly ironic exc" }
-{ "l_orderkey": 5664, "l_partkey": 122, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 25, "l_extendedprice": 25553.0, "l_discount": 0.0, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-10-29", "l_commitdate": "1998-09-23", "l_receiptdate": "1998-11-25", "l_shipinstruct": "COLLECT COD", "l_shipmode": "FOB", "l_comment": "eposits: furiously ironic grouch" }
-{ "l_orderkey": 5670, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 27, "l_extendedprice": 26732.43, "l_discount": 0.1, "l_tax": 0.06, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-05-09", "l_commitdate": "1993-05-30", "l_receiptdate": "1993-06-06", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": " ideas promise bli" }
-{ "l_orderkey": 5728, "l_partkey": 44, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 47, "l_extendedprice": 44369.88, "l_discount": 0.1, "l_tax": 0.05, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-12-13", "l_commitdate": "1995-01-25", "l_receiptdate": "1994-12-25", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "nd the bravely final deposits. final ideas" }
-{ "l_orderkey": 5735, "l_partkey": 60, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 39362.46, "l_discount": 0.01, "l_tax": 0.01, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-12-23", "l_commitdate": "1995-02-10", "l_receiptdate": "1995-01-22", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "lthily ruthless i" }
-{ "l_orderkey": 5826, "l_partkey": 144, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 4176.56, "l_discount": 0.03, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1998-07-31", "l_commitdate": "1998-09-10", "l_receiptdate": "1998-08-27", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": " packages across the fluffily spec" }
-{ "l_orderkey": 5829, "l_partkey": 40, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 4, "l_extendedprice": 3760.16, "l_discount": 0.01, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-03-01", "l_commitdate": "1997-02-17", "l_receiptdate": "1997-03-22", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "ithely; accounts cajole ideas. regular foxe" }
-{ "l_orderkey": 5856, "l_partkey": 4, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 1, "l_extendedprice": 904.0, "l_discount": 0.03, "l_tax": 0.02, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-12-29", "l_commitdate": "1995-01-07", "l_receiptdate": "1995-01-10", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "tly. special deposits wake blithely even" }
-{ "l_orderkey": 5926, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 8, "l_extendedprice": 7920.72, "l_discount": 0.02, "l_tax": 0.0, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-07-17", "l_commitdate": "1994-07-20", "l_receiptdate": "1994-08-11", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": "gle furiously express foxes. bo" }
-{ "l_orderkey": 5927, "l_partkey": 90, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 44, "l_extendedprice": 43563.96, "l_discount": 0.04, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-11-29", "l_commitdate": "1997-11-21", "l_receiptdate": "1997-12-13", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "rding to the special, final decoy" }
-{ "l_orderkey": 5955, "l_partkey": 140, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 14, "l_extendedprice": 14561.96, "l_discount": 0.08, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1995-06-22", "l_commitdate": "1995-05-23", "l_receiptdate": "1995-06-24", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": " unusual, bold theodolit" }
-{ "l_orderkey": 5959, "l_partkey": 135, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 49, "l_extendedprice": 50721.37, "l_discount": 0.07, "l_tax": 0.03, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1992-07-16", "l_commitdate": "1992-08-09", "l_receiptdate": "1992-08-14", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "usual packages haggle slyly pi" }
-{ "l_orderkey": 5988, "l_partkey": 172, "l_suppkey": 1, "l_linenumber": 1, "l_quantity": 41, "l_extendedprice": 43958.97, "l_discount": 0.08, "l_tax": 0.03, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-01-20", "l_commitdate": "1994-02-06", "l_receiptdate": "1994-02-10", "l_shipinstruct": "COLLECT COD", "l_shipmode": "AIR", "l_comment": "the pending, express reque" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.adm
deleted file mode 100644
index 0c2fa2d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.adm
+++ /dev/null
@@ -1,25 +0,0 @@
-{ "l_orderkey": 1, "l_partkey": 156, "l_suppkey": 4, "l_linenumber": 1, "l_quantity": 17, "l_extendedprice": 17954.55, "l_discount": 0.04, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-03-13", "l_commitdate": "1996-02-12", "l_receiptdate": "1996-03-22", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "egular courts above the" }
-{ "l_orderkey": 1, "l_partkey": 68, "l_suppkey": 9, "l_linenumber": 2, "l_quantity": 36, "l_extendedprice": 34850.16, "l_discount": 0.09, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-04-12", "l_commitdate": "1996-02-28", "l_receiptdate": "1996-04-20", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "MAIL", "l_comment": "ly final dependencies: slyly bold " }
-{ "l_orderkey": 1, "l_partkey": 64, "l_suppkey": 5, "l_linenumber": 3, "l_quantity": 8, "l_extendedprice": 7712.48, "l_discount": 0.1, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-29", "l_commitdate": "1996-03-05", "l_receiptdate": "1996-01-31", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "REG AIR", "l_comment": "riously. regular, express dep" }
-{ "l_orderkey": 1, "l_partkey": 3, "l_suppkey": 6, "l_linenumber": 4, "l_quantity": 28, "l_extendedprice": 25284.0, "l_discount": 0.09, "l_tax": 0.06, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-04-21", "l_commitdate": "1996-03-30", "l_receiptdate": "1996-05-16", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "lites. fluffily even de" }
-{ "l_orderkey": 1, "l_partkey": 25, "l_suppkey": 8, "l_linenumber": 5, "l_quantity": 24, "l_extendedprice": 22200.48, "l_discount": 0.1, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-03-30", "l_commitdate": "1996-03-14", "l_receiptdate": "1996-04-01", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": " pending foxes. slyly re" }
-{ "l_orderkey": 1, "l_partkey": 16, "l_suppkey": 3, "l_linenumber": 6, "l_quantity": 32, "l_extendedprice": 29312.32, "l_discount": 0.07, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-30", "l_commitdate": "1996-02-07", "l_receiptdate": "1996-02-03", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "MAIL", "l_comment": "arefully slyly ex" }
-{ "l_orderkey": 2, "l_partkey": 107, "l_suppkey": 2, "l_linenumber": 1, "l_quantity": 38, "l_extendedprice": 38269.8, "l_discount": 0.0, "l_tax": 0.05, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1997-01-28", "l_commitdate": "1997-01-14", "l_receiptdate": "1997-02-02", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ven requests. deposits breach a" }
-{ "l_orderkey": 3, "l_partkey": 5, "l_suppkey": 2, "l_linenumber": 1, "l_quantity": 45, "l_extendedprice": 40725.0, "l_discount": 0.06, "l_tax": 0.0, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-02-02", "l_commitdate": "1994-01-04", "l_receiptdate": "1994-02-23", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "ongside of the furiously brave acco" }
-{ "l_orderkey": 3, "l_partkey": 20, "l_suppkey": 10, "l_linenumber": 2, "l_quantity": 49, "l_extendedprice": 45080.98, "l_discount": 0.1, "l_tax": 0.0, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-11-09", "l_commitdate": "1993-12-20", "l_receiptdate": "1993-11-24", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": " unusual accounts. eve" }
-{ "l_orderkey": 3, "l_partkey": 129, "l_suppkey": 8, "l_linenumber": 3, "l_quantity": 27, "l_extendedprice": 27786.24, "l_discount": 0.06, "l_tax": 0.07, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-01-16", "l_commitdate": "1993-11-22", "l_receiptdate": "1994-01-23", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "SHIP", "l_comment": "nal foxes wake. " }
-{ "l_orderkey": 3, "l_partkey": 30, "l_suppkey": 5, "l_linenumber": 4, "l_quantity": 2, "l_extendedprice": 1860.06, "l_discount": 0.01, "l_tax": 0.06, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-12-04", "l_commitdate": "1994-01-07", "l_receiptdate": "1994-01-01", "l_shipinstruct": "NONE", "l_shipmode": "TRUCK", "l_comment": "y. fluffily pending d" }
-{ "l_orderkey": 3, "l_partkey": 184, "l_suppkey": 5, "l_linenumber": 5, "l_quantity": 28, "l_extendedprice": 30357.04, "l_discount": 0.04, "l_tax": 0.0, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1993-12-14", "l_commitdate": "1994-01-10", "l_receiptdate": "1994-01-01", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": "ages nag slyly pending" }
-{ "l_orderkey": 3, "l_partkey": 63, "l_suppkey": 8, "l_linenumber": 6, "l_quantity": 26, "l_extendedprice": 25039.56, "l_discount": 0.1, "l_tax": 0.02, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1993-10-29", "l_commitdate": "1993-12-18", "l_receiptdate": "1993-11-04", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "RAIL", "l_comment": "ges sleep after the caref" }
-{ "l_orderkey": 4, "l_partkey": 89, "l_suppkey": 10, "l_linenumber": 1, "l_quantity": 30, "l_extendedprice": 29672.4, "l_discount": 0.03, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-10", "l_commitdate": "1995-12-14", "l_receiptdate": "1996-01-18", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "REG AIR", "l_comment": "- quickly regular packages sleep. idly" }
-{ "l_orderkey": 5, "l_partkey": 109, "l_suppkey": 10, "l_linenumber": 1, "l_quantity": 15, "l_extendedprice": 15136.5, "l_discount": 0.02, "l_tax": 0.04, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-10-31", "l_commitdate": "1994-08-31", "l_receiptdate": "1994-11-20", "l_shipinstruct": "NONE", "l_shipmode": "AIR", "l_comment": "ts wake furiously " }
-{ "l_orderkey": 5, "l_partkey": 124, "l_suppkey": 5, "l_linenumber": 2, "l_quantity": 26, "l_extendedprice": 26627.12, "l_discount": 0.07, "l_tax": 0.08, "l_returnflag": "R", "l_linestatus": "F", "l_shipdate": "1994-10-16", "l_commitdate": "1994-09-25", "l_receiptdate": "1994-10-19", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "sts use slyly quickly special instruc" }
-{ "l_orderkey": 5, "l_partkey": 38, "l_suppkey": 4, "l_linenumber": 3, "l_quantity": 50, "l_extendedprice": 46901.5, "l_discount": 0.08, "l_tax": 0.03, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1994-08-08", "l_commitdate": "1994-10-13", "l_receiptdate": "1994-08-26", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "AIR", "l_comment": "eodolites. fluffily unusual" }
-{ "l_orderkey": 6, "l_partkey": 140, "l_suppkey": 6, "l_linenumber": 1, "l_quantity": 37, "l_extendedprice": 38485.18, "l_discount": 0.08, "l_tax": 0.03, "l_returnflag": "A", "l_linestatus": "F", "l_shipdate": "1992-04-27", "l_commitdate": "1992-05-15", "l_receiptdate": "1992-05-02", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "TRUCK", "l_comment": "p furiously special foxes" }
-{ "l_orderkey": 7, "l_partkey": 183, "l_suppkey": 4, "l_linenumber": 1, "l_quantity": 12, "l_extendedprice": 12998.16, "l_discount": 0.07, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-05-07", "l_commitdate": "1996-03-13", "l_receiptdate": "1996-06-03", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": "ss pinto beans wake against th" }
-{ "l_orderkey": 7, "l_partkey": 146, "l_suppkey": 3, "l_linenumber": 2, "l_quantity": 9, "l_extendedprice": 9415.26, "l_discount": 0.08, "l_tax": 0.08, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-01", "l_commitdate": "1996-03-02", "l_receiptdate": "1996-02-19", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "SHIP", "l_comment": "es. instructions" }
-{ "l_orderkey": 7, "l_partkey": 95, "l_suppkey": 8, "l_linenumber": 3, "l_quantity": 46, "l_extendedprice": 45774.14, "l_discount": 0.1, "l_tax": 0.07, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-15", "l_commitdate": "1996-03-27", "l_receiptdate": "1996-02-03", "l_shipinstruct": "COLLECT COD", "l_shipmode": "MAIL", "l_comment": " unusual reques" }
-{ "l_orderkey": 7, "l_partkey": 164, "l_suppkey": 5, "l_linenumber": 4, "l_quantity": 28, "l_extendedprice": 29796.48, "l_discount": 0.03, "l_tax": 0.04, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-03-21", "l_commitdate": "1996-04-08", "l_receiptdate": "1996-04-20", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": ". slyly special requests haggl" }
-{ "l_orderkey": 7, "l_partkey": 152, "l_suppkey": 4, "l_linenumber": 5, "l_quantity": 38, "l_extendedprice": 39981.7, "l_discount": 0.08, "l_tax": 0.01, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-11", "l_commitdate": "1996-02-24", "l_receiptdate": "1996-02-18", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "ns haggle carefully ironic deposits. bl" }
-{ "l_orderkey": 7, "l_partkey": 80, "l_suppkey": 10, "l_linenumber": 6, "l_quantity": 35, "l_extendedprice": 34302.8, "l_discount": 0.06, "l_tax": 0.03, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-01-16", "l_commitdate": "1996-02-23", "l_receiptdate": "1996-01-22", "l_shipinstruct": "TAKE BACK RETURN", "l_shipmode": "FOB", "l_comment": "jole. excuses wake carefully alongside of " }
-{ "l_orderkey": 7, "l_partkey": 158, "l_suppkey": 3, "l_linenumber": 7, "l_quantity": 5, "l_extendedprice": 5290.75, "l_discount": 0.04, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-02-10", "l_commitdate": "1996-03-26", "l_receiptdate": "1996-02-13", "l_shipinstruct": "NONE", "l_shipmode": "FOB", "l_comment": "ithely regula" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.adm
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.adm
+++ /dev/null
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/drop-index/drop-index.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/drop-index/drop-index.1.adm
deleted file mode 100644
index f3c688b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/drop-index/drop-index.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "unique1": 84, "unique2": 10, "two": 0, "four": 0, "ten": 4, "twenty": 4, "onePercent": 84, "tenPercent": 4, "twentyPercent": 4, "fiftyPercent": 0, "unique3": 84, "evenOnePercent": 168, "oddOnePercent": 169, "stringu1": "DGAAAAXXXXXXXXXXXXXXXXXXX", "stringu2": "KAAAAAXXXXXXXXXXXXXXXXXXX", "string4": "OOOOXXXXXXXXXXXXXXXXXXXXXX" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/empty-load-with-index/empty-load-with-index.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/empty-load-with-index/empty-load-with-index.1.adm
deleted file mode 100644
index 8344a9f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/empty-load-with-index/empty-load-with-index.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "l_orderkey": 1, "l_partkey": 156, "l_suppkey": 4, "l_linenumber": 1, "l_quantity": 17.0, "l_extendedprice": 17954.55, "l_discount": 0.04, "l_tax": 0.02, "l_returnflag": "N", "l_linestatus": "O", "l_shipdate": "1996-03-13", "l_commitdate": "1996-02-12", "l_receiptdate": "1996-03-22", "l_shipinstruct": "DELIVER IN PERSON", "l_shipmode": "TRUCK", "l_comment": "egular courts above the" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.adm
deleted file mode 100644
index 0eea6ff..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.adm
+++ /dev/null
@@ -1,240 +0,0 @@
-{ "id": 101, "fname": "Javier", "lname": "Makuch", "age": 28, "dept": "IT" }
-{ "id": 110, "fname": "Allan", "lname": "Piland", "age": 29, "dept": "HR" }
-{ "id": 112, "fname": "Pearlie", "lname": "Aumann", "age": 31, "dept": "Payroll" }
-{ "id": 113, "fname": "Chandra", "lname": "Hase", "age": 34, "dept": "Sales" }
-{ "id": 114, "fname": "Christian", "lname": "Convery", "age": 28, "dept": "HR" }
-{ "id": 115, "fname": "Panther", "lname": "Ritch", "age": 26, "dept": "IT" }
-{ "id": 116, "fname": "Ted", "lname": "Elsea", "age": 26, "dept": "IT" }
-{ "id": 117, "fname": "Tabatha", "lname": "Bladen", "age": 25, "dept": "HR" }
-{ "id": 118, "fname": "Clayton", "lname": "Oltman", "age": 42, "dept": "Sales" }
-{ "id": 119, "fname": "Sharron", "lname": "Darwin", "age": 32, "dept": "Payroll" }
-{ "id": 210, "fname": "Clayton", "lname": "Durgin", "age": 52, "dept": "HR" }
-{ "id": 212, "fname": "Emilia", "lname": "Chenail", "age": 26, "dept": "Sales" }
-{ "id": 213, "fname": "Kenya", "lname": "Almquist", "age": 43, "dept": "Payroll" }
-{ "id": 214, "fname": "Alejandra", "lname": "Lacefield", "age": 41, "dept": "HR" }
-{ "id": 215, "fname": "Karina", "lname": "Michelsen", "age": 46, "dept": "IT" }
-{ "id": 216, "fname": "Katy", "lname": "Delillo", "age": 36, "dept": "IT" }
-{ "id": 217, "fname": "Benita", "lname": "Kleist", "age": 37, "dept": "HR" }
-{ "id": 218, "fname": "Earlene", "lname": "Paluch", "age": 31, "dept": "IT" }
-{ "id": 219, "fname": "Kurt", "lname": "Petermann", "age": 27, "dept": "Payroll" }
-{ "id": 299, "fname": "Julio", "lname": "Iorio", "age": 37, "dept": "IT" }
-{ "id": 363, "fname": "Cody", "lname": "Rodreguez", "age": 26, "dept": "IT" }
-{ "id": 404, "fname": "Emilia", "lname": "Square", "age": 32, "dept": "IT" }
-{ "id": 414, "fname": "Mathew", "lname": "Fuschetto", "age": 34, "dept": "HR" }
-{ "id": 424, "fname": "Allyson", "lname": "Remus", "age": 32, "dept": "IT" }
-{ "id": 434, "fname": "Earlene", "lname": "Linebarger", "age": 26, "dept": "Payroll" }
-{ "id": 444, "fname": "Clinton", "lname": "Sick", "age": 29, "dept": "IT" }
-{ "id": 454, "fname": "Ted", "lname": "Caba", "age": 28, "dept": "HR" }
-{ "id": 463, "fname": "Marcie", "lname": "States", "age": 28, "dept": "IT" }
-{ "id": 464, "fname": "Fernando", "lname": "Engelke", "age": 39, "dept": "IT" }
-{ "id": 474, "fname": "Mathew", "lname": "Courchesne", "age": 31, "dept": "IT" }
-{ "id": 484, "fname": "Cody", "lname": "Vinyard", "age": 36, "dept": "Payroll" }
-{ "id": 494, "fname": "Benita", "lname": "Fravel", "age": 33, "dept": "Sales" }
-{ "id": 504, "fname": "Erik", "lname": "Dobek", "age": 29, "dept": "IT" }
-{ "id": 514, "fname": "Julio", "lname": "Ruben", "age": 41, "dept": "IT" }
-{ "id": 524, "fname": "Benita", "lname": "Maltos", "age": 33, "dept": "IT" }
-{ "id": 534, "fname": "Kurt", "lname": "Biscoe", "age": 36, "dept": "HR" }
-{ "id": 538, "fname": "Milagros", "lname": "Forkey", "age": 34, "dept": "Sales" }
-{ "id": 544, "fname": "Loraine", "lname": "Housel", "age": 30, "dept": "Sales" }
-{ "id": 554, "fname": "Jamie", "lname": "Rachal", "age": 30, "dept": "IT" }
-{ "id": 564, "fname": "Liza", "lname": "Fredenburg", "age": 37, "dept": "IT" }
-{ "id": 574, "fname": "Ericka", "lname": "Feldmann", "age": 29, "dept": "Sales" }
-{ "id": 584, "fname": "Dollie", "lname": "Dattilo", "age": 32, "dept": "Payroll" }
-{ "id": 589, "fname": "Lorrie", "lname": "Sharon", "age": 27, "dept": "IT" }
-{ "id": 594, "fname": "Roxie", "lname": "Houghtaling", "age": 40, "dept": "Payroll" }
-{ "id": 601, "fname": "Neil", "lname": "Deforge", "age": 26, "dept": "HR" }
-{ "id": 611, "fname": "Earlene", "lname": "Marcy", "age": 32, "dept": "IT" }
-{ "id": 621, "fname": "Erik", "lname": "Lechuga", "age": 42, "dept": "Payroll" }
-{ "id": 631, "fname": "Tyrone", "lname": "Holtzclaw", "age": 34, "dept": "Sales" }
-{ "id": 641, "fname": "Lance", "lname": "Hankey", "age": 35, "dept": "Sales" }
-{ "id": 651, "fname": "Mallory", "lname": "Gladding", "age": 31, "dept": "HR" }
-{ "id": 661, "fname": "Tia", "lname": "Braaten", "age": 40, "dept": "IT" }
-{ "id": 671, "fname": "Julio", "lname": "Vanpatten", "age": 30, "dept": "Payroll" }
-{ "id": 681, "fname": "Max", "lname": "Teachout", "age": 34, "dept": "IT" }
-{ "id": 691, "fname": "Karina", "lname": "Wingerter", "age": 31, "dept": "IT" }
-{ "id": 711, "fname": "Hugh", "lname": "Lema", "age": 25, "dept": "HR" }
-{ "id": 721, "fname": "Schwan", "lname": "Phil", "age": 34, "dept": "Payroll" }
-{ "id": 732, "fname": "Noemi", "lname": "Eacret", "age": 56, "dept": "HR" }
-{ "id": 741, "fname": "Julio", "lname": "Mattocks", "age": 38, "dept": "Sales" }
-{ "id": 751, "fname": "Lance", "lname": "Kottke", "age": 34, "dept": "IT" }
-{ "id": 761, "fname": "Kurt", "lname": "Liz", "age": 32, "dept": "HR" }
-{ "id": 771, "fname": "Neva", "lname": "Barbeau", "age": 45, "dept": "Sales" }
-{ "id": 781, "fname": "Karina", "lname": "Tuthill", "age": 46, "dept": "Payroll" }
-{ "id": 791, "fname": "Maricela", "lname": "Cambron", "age": 36, "dept": "IT" }
-{ "id": 809, "fname": "Clayton", "lname": "Delany", "age": 23, "dept": "IT" }
-{ "id": 811, "fname": "Kubik", "lname": "Kuhn", "age": 27, "dept": "HR" }
-{ "id": 821, "fname": "Allan", "lname": "Tomes", "age": 29, "dept": "Payroll" }
-{ "id": 831, "fname": "Lonnie", "lname": "Aller", "age": 33, "dept": "Sales" }
-{ "id": 841, "fname": "Neil", "lname": "Hurrell", "age": 26, "dept": "IT" }
-{ "id": 851, "fname": "Clayton", "lname": "Engles", "age": 41, "dept": "HR" }
-{ "id": 861, "fname": "Javier", "lname": "Gabrielson", "age": 39, "dept": "Payroll" }
-{ "id": 871, "fname": "Allan", "lname": "Alejandre", "age": 48, "dept": "IT" }
-{ "id": 881, "fname": "Julio", "lname": "Isa", "age": 38, "dept": "Sales" }
-{ "id": 891, "fname": "Roslyn", "lname": "Simmerman", "age": 31, "dept": "IT" }
-{ "id": 915, "fname": "Starner", "lname": "Stuart", "age": 25, "dept": "Sales" }
-{ "id": 925, "fname": "Sofia", "lname": "Cuff", "age": 30, "dept": "HR" }
-{ "id": 935, "fname": "Milagros", "lname": "Murguia", "age": 31, "dept": "IT" }
-{ "id": 945, "fname": "Margery", "lname": "Haldeman", "age": 32, "dept": "IT" }
-{ "id": 955, "fname": "Max", "lname": "Mell", "age": 33, "dept": "HR" }
-{ "id": 965, "fname": "Micco", "lname": "Mercy", "age": 31, "dept": "Payroll" }
-{ "id": 975, "fname": "Clare", "lname": "Vangieson", "age": 34, "dept": "IT" }
-{ "id": 985, "fname": "Elnora", "lname": "Dimauro", "age": 35, "dept": "Sales" }
-{ "id": 995, "fname": "Pearlie", "lname": "Kocian", "age": 38, "dept": "HR" }
-{ "id": 1007, "fname": "Yingyi", "lname": "Bu", "age": 27, "dept": "IT" }
-{ "id": 1263, "fname": "Tania", "lname": "Loffredo", "age": 25, "dept": "IT" }
-{ "id": 1410, "fname": "Clinton", "lname": "Fredricks", "age": 34, "dept": "IT" }
-{ "id": 1411, "fname": "Lance", "lname": "Farquhar", "age": 32, "dept": "HR" }
-{ "id": 1412, "fname": "Tabatha", "lname": "Crisler", "age": 33, "dept": "IT" }
-{ "id": 1413, "fname": "Max", "lname": "Durney", "age": 29, "dept": "IT" }
-{ "id": 1414, "fname": "Carmella", "lname": "Strauser", "age": 30, "dept": "Payroll" }
-{ "id": 1415, "fname": "Kelly", "lname": "Carrales", "age": 40, "dept": "IT" }
-{ "id": 1416, "fname": "Guy", "lname": "Merten", "age": 29, "dept": "Sales" }
-{ "id": 1417, "fname": "Noreen", "lname": "Ruhland", "age": 29, "dept": "IT" }
-{ "id": 1418, "fname": "Julio", "lname": "Damore", "age": 27, "dept": "Sales" }
-{ "id": 1419, "fname": "Selena", "lname": "Truby", "age": 25, "dept": "HR" }
-{ "id": 1420, "fname": "Alejandra", "lname": "Commons", "age": 30, "dept": "Sales" }
-{ "id": 1421, "fname": "Allyson", "lname": "Balk", "age": 30, "dept": "IT" }
-{ "id": 1422, "fname": "Nelson", "lname": "Byun", "age": 40, "dept": "Sales" }
-{ "id": 1423, "fname": "Christian", "lname": "Reidhead", "age": 40, "dept": "IT" }
-{ "id": 1424, "fname": "Pearlie", "lname": "Hopkin", "age": 48, "dept": "Payroll" }
-{ "id": 1425, "fname": "Nelson", "lname": "Wohlers", "age": 41, "dept": "HR" }
-{ "id": 1426, "fname": "Marcie", "lname": "Rasnake", "age": 42, "dept": "Sales" }
-{ "id": 1427, "fname": "Hugh", "lname": "Marshburn", "age": 43, "dept": "Payroll" }
-{ "id": 1428, "fname": "Mathew", "lname": "Marasco", "age": 45, "dept": "Sales" }
-{ "id": 1429, "fname": "Kurt", "lname": "Veres", "age": 32, "dept": "IT" }
-{ "id": 1430, "fname": "Julio", "lname": "Barkett", "age": 39, "dept": "Sales" }
-{ "id": 1863, "fname": "Darren", "lname": "Thorington", "age": 32, "dept": "Sales" }
-{ "id": 1999, "fname": "Susan", "lname": "Malaika", "age": 42, "dept": "HR" }
-{ "id": 2333, "fname": "Chen", "lname": "Li", "age": 42, "dept": "HR" }
-{ "id": 2963, "fname": "Neil", "lname": "Gunnerson", "age": 34, "dept": "IT" }
-{ "id": 3563, "fname": "Hazeltine", "lname": "Susan", "age": 29, "dept": "Sales" }
-{ "id": 3666, "fname": "Young Seok", "lname": "Kim", "age": 35, "dept": "Payroll" }
-{ "id": 4727, "fname": "Michael", "lname": "Carey", "age": 50, "dept": "Payroll" }
-{ "id": 5438, "fname": "Lakisha", "lname": "Quashie", "age": 29, "dept": "HR" }
-{ "id": 7444, "fname": "Sharad", "lname": "Mehrotra", "age": 42, "dept": "Sales" }
-{ "id": 7663, "fname": "Annabelle", "lname": "Nimmo", "age": 30, "dept": "Payroll" }
-{ "id": 8301, "fname": "Earlene", "lname": "Wallick", "age": 26, "dept": "HR" }
-{ "id": 8338, "fname": "Julio", "lname": "Bosket", "age": 28, "dept": "Payroll" }
-{ "id": 9555, "fname": "Tony", "lname": "Givargis", "age": 40, "dept": "Sales" }
-{ "id": 9763, "fname": "Ted", "lname": "Saini", "age": 31, "dept": "IT" }
-{ "id": 9941, "fname": "Khurram Faraaz", "lname": "Mohammed", "age": 30, "dept": "HR" }
-{ "id": 10101, "fname": "Javier", "lname": "Makuch", "age": 28, "dept": "IT" }
-{ "id": 10110, "fname": "Allan", "lname": "Piland", "age": 29, "dept": "HR" }
-{ "id": 10112, "fname": "Pearlie", "lname": "Aumann", "age": 31, "dept": "Payroll" }
-{ "id": 10113, "fname": "Chandra", "lname": "Hase", "age": 34, "dept": "Sales" }
-{ "id": 10114, "fname": "Christian", "lname": "Convery", "age": 28, "dept": "HR" }
-{ "id": 10115, "fname": "Panther", "lname": "Ritch", "age": 26, "dept": "IT" }
-{ "id": 10116, "fname": "Ted", "lname": "Elsea", "age": 26, "dept": "IT" }
-{ "id": 10117, "fname": "Tabatha", "lname": "Bladen", "age": 25, "dept": "HR" }
-{ "id": 10118, "fname": "Clayton", "lname": "Oltman", "age": 42, "dept": "Sales" }
-{ "id": 10119, "fname": "Sharron", "lname": "Darwin", "age": 32, "dept": "Payroll" }
-{ "id": 10210, "fname": "Clayton", "lname": "Durgin", "age": 52, "dept": "HR" }
-{ "id": 10212, "fname": "Emilia", "lname": "Chenail", "age": 26, "dept": "Sales" }
-{ "id": 10213, "fname": "Kenya", "lname": "Almquist", "age": 43, "dept": "Payroll" }
-{ "id": 10214, "fname": "Alejandra", "lname": "Lacefield", "age": 41, "dept": "HR" }
-{ "id": 10215, "fname": "Karina", "lname": "Michelsen", "age": 46, "dept": "IT" }
-{ "id": 10216, "fname": "Katy", "lname": "Delillo", "age": 36, "dept": "IT" }
-{ "id": 10217, "fname": "Benita", "lname": "Kleist", "age": 37, "dept": "HR" }
-{ "id": 10218, "fname": "Earlene", "lname": "Paluch", "age": 31, "dept": "IT" }
-{ "id": 10219, "fname": "Kurt", "lname": "Petermann", "age": 27, "dept": "Payroll" }
-{ "id": 10299, "fname": "Julio", "lname": "Iorio", "age": 37, "dept": "IT" }
-{ "id": 10363, "fname": "Cody", "lname": "Rodreguez", "age": 26, "dept": "IT" }
-{ "id": 10404, "fname": "Emilia", "lname": "Square", "age": 32, "dept": "IT" }
-{ "id": 10414, "fname": "Mathew", "lname": "Fuschetto", "age": 34, "dept": "HR" }
-{ "id": 10424, "fname": "Allyson", "lname": "Remus", "age": 32, "dept": "IT" }
-{ "id": 10434, "fname": "Earlene", "lname": "Linebarger", "age": 26, "dept": "Payroll" }
-{ "id": 10444, "fname": "Clinton", "lname": "Sick", "age": 29, "dept": "IT" }
-{ "id": 10454, "fname": "Ted", "lname": "Caba", "age": 28, "dept": "HR" }
-{ "id": 10463, "fname": "Marcie", "lname": "States", "age": 28, "dept": "IT" }
-{ "id": 10464, "fname": "Fernando", "lname": "Engelke", "age": 39, "dept": "IT" }
-{ "id": 10474, "fname": "Mathew", "lname": "Courchesne", "age": 31, "dept": "IT" }
-{ "id": 10484, "fname": "Cody", "lname": "Vinyard", "age": 36, "dept": "Payroll" }
-{ "id": 10494, "fname": "Benita", "lname": "Fravel", "age": 33, "dept": "Sales" }
-{ "id": 10504, "fname": "Erik", "lname": "Dobek", "age": 29, "dept": "IT" }
-{ "id": 10514, "fname": "Julio", "lname": "Ruben", "age": 41, "dept": "IT" }
-{ "id": 10524, "fname": "Benita", "lname": "Maltos", "age": 33, "dept": "IT" }
-{ "id": 10534, "fname": "Kurt", "lname": "Biscoe", "age": 36, "dept": "HR" }
-{ "id": 10538, "fname": "Milagros", "lname": "Forkey", "age": 34, "dept": "Sales" }
-{ "id": 10544, "fname": "Loraine", "lname": "Housel", "age": 30, "dept": "Sales" }
-{ "id": 10554, "fname": "Jamie", "lname": "Rachal", "age": 30, "dept": "IT" }
-{ "id": 10564, "fname": "Liza", "lname": "Fredenburg", "age": 37, "dept": "IT" }
-{ "id": 10574, "fname": "Ericka", "lname": "Feldmann", "age": 29, "dept": "Sales" }
-{ "id": 10584, "fname": "Dollie", "lname": "Dattilo", "age": 32, "dept": "Payroll" }
-{ "id": 10589, "fname": "Lorrie", "lname": "Sharon", "age": 27, "dept": "IT" }
-{ "id": 10594, "fname": "Roxie", "lname": "Houghtaling", "age": 40, "dept": "Payroll" }
-{ "id": 10601, "fname": "Neil", "lname": "Deforge", "age": 26, "dept": "HR" }
-{ "id": 10611, "fname": "Earlene", "lname": "Marcy", "age": 32, "dept": "IT" }
-{ "id": 10621, "fname": "Erik", "lname": "Lechuga", "age": 42, "dept": "Payroll" }
-{ "id": 10631, "fname": "Tyrone", "lname": "Holtzclaw", "age": 34, "dept": "Sales" }
-{ "id": 10641, "fname": "Lance", "lname": "Hankey", "age": 35, "dept": "Sales" }
-{ "id": 10651, "fname": "Mallory", "lname": "Gladding", "age": 31, "dept": "HR" }
-{ "id": 10661, "fname": "Tia", "lname": "Braaten", "age": 40, "dept": "IT" }
-{ "id": 10671, "fname": "Julio", "lname": "Vanpatten", "age": 30, "dept": "Payroll" }
-{ "id": 10681, "fname": "Max", "lname": "Teachout", "age": 34, "dept": "IT" }
-{ "id": 10691, "fname": "Karina", "lname": "Wingerter", "age": 31, "dept": "IT" }
-{ "id": 10711, "fname": "Hugh", "lname": "Lema", "age": 25, "dept": "HR" }
-{ "id": 10721, "fname": "Schwan", "lname": "Phil", "age": 34, "dept": "Payroll" }
-{ "id": 10732, "fname": "Noemi", "lname": "Eacret", "age": 56, "dept": "HR" }
-{ "id": 10741, "fname": "Julio", "lname": "Mattocks", "age": 38, "dept": "Sales" }
-{ "id": 10751, "fname": "Lance", "lname": "Kottke", "age": 34, "dept": "IT" }
-{ "id": 10761, "fname": "Kurt", "lname": "Liz", "age": 32, "dept": "HR" }
-{ "id": 10771, "fname": "Neva", "lname": "Barbeau", "age": 45, "dept": "Sales" }
-{ "id": 10781, "fname": "Karina", "lname": "Tuthill", "age": 46, "dept": "Payroll" }
-{ "id": 10791, "fname": "Maricela", "lname": "Cambron", "age": 36, "dept": "IT" }
-{ "id": 10809, "fname": "Clayton", "lname": "Delany", "age": 23, "dept": "IT" }
-{ "id": 10811, "fname": "Kubik", "lname": "Kuhn", "age": 27, "dept": "HR" }
-{ "id": 10821, "fname": "Allan", "lname": "Tomes", "age": 29, "dept": "Payroll" }
-{ "id": 10831, "fname": "Lonnie", "lname": "Aller", "age": 33, "dept": "Sales" }
-{ "id": 10841, "fname": "Neil", "lname": "Hurrell", "age": 26, "dept": "IT" }
-{ "id": 10851, "fname": "Clayton", "lname": "Engles", "age": 41, "dept": "HR" }
-{ "id": 10861, "fname": "Javier", "lname": "Gabrielson", "age": 39, "dept": "Payroll" }
-{ "id": 10871, "fname": "Allan", "lname": "Alejandre", "age": 48, "dept": "IT" }
-{ "id": 10881, "fname": "Julio", "lname": "Isa", "age": 38, "dept": "Sales" }
-{ "id": 10891, "fname": "Roslyn", "lname": "Simmerman", "age": 31, "dept": "IT" }
-{ "id": 10915, "fname": "Starner", "lname": "Stuart", "age": 25, "dept": "Sales" }
-{ "id": 10925, "fname": "Sofia", "lname": "Cuff", "age": 30, "dept": "HR" }
-{ "id": 10935, "fname": "Milagros", "lname": "Murguia", "age": 31, "dept": "IT" }
-{ "id": 10945, "fname": "Margery", "lname": "Haldeman", "age": 32, "dept": "IT" }
-{ "id": 10955, "fname": "Max", "lname": "Mell", "age": 33, "dept": "HR" }
-{ "id": 10965, "fname": "Micco", "lname": "Mercy", "age": 31, "dept": "Payroll" }
-{ "id": 10975, "fname": "Clare", "lname": "Vangieson", "age": 34, "dept": "IT" }
-{ "id": 10985, "fname": "Elnora", "lname": "Dimauro", "age": 35, "dept": "Sales" }
-{ "id": 10995, "fname": "Pearlie", "lname": "Kocian", "age": 38, "dept": "HR" }
-{ "id": 11007, "fname": "Yingyi", "lname": "Bu", "age": 27, "dept": "IT" }
-{ "id": 11263, "fname": "Tania", "lname": "Loffredo", "age": 25, "dept": "IT" }
-{ "id": 11410, "fname": "Clinton", "lname": "Fredricks", "age": 34, "dept": "IT" }
-{ "id": 11411, "fname": "Lance", "lname": "Farquhar", "age": 32, "dept": "HR" }
-{ "id": 11412, "fname": "Tabatha", "lname": "Crisler", "age": 33, "dept": "IT" }
-{ "id": 11413, "fname": "Max", "lname": "Durney", "age": 29, "dept": "IT" }
-{ "id": 11414, "fname": "Carmella", "lname": "Strauser", "age": 30, "dept": "Payroll" }
-{ "id": 11415, "fname": "Kelly", "lname": "Carrales", "age": 40, "dept": "IT" }
-{ "id": 11416, "fname": "Guy", "lname": "Merten", "age": 29, "dept": "Sales" }
-{ "id": 11417, "fname": "Noreen", "lname": "Ruhland", "age": 29, "dept": "IT" }
-{ "id": 11418, "fname": "Julio", "lname": "Damore", "age": 27, "dept": "Sales" }
-{ "id": 11419, "fname": "Selena", "lname": "Truby", "age": 25, "dept": "HR" }
-{ "id": 11420, "fname": "Alejandra", "lname": "Commons", "age": 30, "dept": "Sales" }
-{ "id": 11421, "fname": "Allyson", "lname": "Balk", "age": 30, "dept": "IT" }
-{ "id": 11422, "fname": "Nelson", "lname": "Byun", "age": 40, "dept": "Sales" }
-{ "id": 11423, "fname": "Christian", "lname": "Reidhead", "age": 40, "dept": "IT" }
-{ "id": 11424, "fname": "Pearlie", "lname": "Hopkin", "age": 48, "dept": "Payroll" }
-{ "id": 11425, "fname": "Nelson", "lname": "Wohlers", "age": 41, "dept": "HR" }
-{ "id": 11426, "fname": "Marcie", "lname": "Rasnake", "age": 42, "dept": "Sales" }
-{ "id": 11427, "fname": "Hugh", "lname": "Marshburn", "age": 43, "dept": "Payroll" }
-{ "id": 11428, "fname": "Mathew", "lname": "Marasco", "age": 45, "dept": "Sales" }
-{ "id": 11429, "fname": "Kurt", "lname": "Veres", "age": 32, "dept": "IT" }
-{ "id": 11430, "fname": "Julio", "lname": "Barkett", "age": 39, "dept": "Sales" }
-{ "id": 11863, "fname": "Darren", "lname": "Thorington", "age": 32, "dept": "Sales" }
-{ "id": 11999, "fname": "Susan", "lname": "Malaika", "age": 42, "dept": "HR" }
-{ "id": 12333, "fname": "Chen", "lname": "Li", "age": 42, "dept": "HR" }
-{ "id": 12963, "fname": "Neil", "lname": "Gunnerson", "age": 34, "dept": "IT" }
-{ "id": 13563, "fname": "Hazeltine", "lname": "Susan", "age": 29, "dept": "Sales" }
-{ "id": 13666, "fname": "Young Seok", "lname": "Kim", "age": 35, "dept": "Payroll" }
-{ "id": 14727, "fname": "Michael", "lname": "Carey", "age": 50, "dept": "Payroll" }
-{ "id": 15438, "fname": "Lakisha", "lname": "Quashie", "age": 29, "dept": "HR" }
-{ "id": 17444, "fname": "Sharad", "lname": "Mehrotra", "age": 42, "dept": "Sales" }
-{ "id": 17663, "fname": "Annabelle", "lname": "Nimmo", "age": 30, "dept": "Payroll" }
-{ "id": 18301, "fname": "Earlene", "lname": "Wallick", "age": 26, "dept": "HR" }
-{ "id": 18338, "fname": "Julio", "lname": "Bosket", "age": 28, "dept": "Payroll" }
-{ "id": 19555, "fname": "Tony", "lname": "Givargis", "age": 40, "dept": "Sales" }
-{ "id": 19763, "fname": "Ted", "lname": "Saini", "age": 31, "dept": "IT" }
-{ "id": 19941, "fname": "Khurram Faraaz", "lname": "Mohammed", "age": 30, "dept": "HR" }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.adm
deleted file mode 100644
index 55b9a4d..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.adm
+++ /dev/null
@@ -1,20 +0,0 @@
-{ "id": 1 }
-{ "id": 2 }
-{ "id": 3 }
-{ "id": 4 }
-{ "id": 5 }
-{ "id": 6 }
-{ "id": 7 }
-{ "id": 8 }
-{ "id": 9 }
-{ "id": 10 }
-{ "id": 11 }
-{ "id": 12 }
-{ "id": 13 }
-{ "id": 14 }
-{ "id": 15 }
-{ "id": 16 }
-{ "id": 17 }
-{ "id": 18 }
-{ "id": 19 }
-{ "id": 20 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.adm
deleted file mode 100644
index c39ad6b..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.adm
+++ /dev/null
@@ -1,4 +0,0 @@
-{ "l_returnflag": "A", "l_linestatus": "F", "sum_qty": 37474.0, "sum_base_price": 3.7569624640000015E7, "sum_disc_price": 3.5676192097E7, "sum_charge": 3.710141622242399E7, "ave_qty": 25.354533152909337, "ave_price": 25419.231826792973, "ave_disc": 0.050866035182679264, "count_order": 1478 }
-{ "l_returnflag": "N", "l_linestatus": "F", "sum_qty": 1041.0, "sum_base_price": 1041301.0700000001, "sum_disc_price": 999060.898, "sum_charge": 1036450.80228, "ave_qty": 27.394736842105264, "ave_price": 27402.659736842106, "ave_disc": 0.04289473684210526, "count_order": 38 }
-{ "l_returnflag": "N", "l_linestatus": "O", "sum_qty": 75168.0, "sum_base_price": 7.538495536999999E7, "sum_disc_price": 7.165316630340001E7, "sum_charge": 7.449879813307299E7, "ave_qty": 25.558653519211152, "ave_price": 25632.422771166268, "ave_disc": 0.04969738184291062, "count_order": 2941 }
-{ "l_returnflag": "R", "l_linestatus": "F", "sum_qty": 36511.0, "sum_base_price": 3.657084124E7, "sum_disc_price": 3.47384728758E7, "sum_charge": 3.616906011219301E7, "ave_qty": 25.059025394646532, "ave_price": 25100.09693891558, "ave_disc": 0.05002745367192856, "count_order": 1457 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.adm
deleted file mode 100644
index 0e739c3..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-{ "id": 10 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.adm
deleted file mode 100644
index 0dd81cd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.adm
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "id": 10 }
-{ "id": 12 }
-{ "id": 20 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.adm
deleted file mode 100644
index 0dd81cd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.adm
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "id": 10 }
-{ "id": 12 }
-{ "id": 20 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-temp-to-persistent/scan-insert-persistent-to-temp.1.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-temp-to-persistent/scan-insert-persistent-to-temp.1.adm
deleted file mode 100644
index 0dd81cd..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/scan-insert-temp-to-persistent/scan-insert-persistent-to-temp.1.adm
+++ /dev/null
@@ -1,3 +0,0 @@
-{ "id": 10 }
-{ "id": 12 }
-{ "id": 20 }
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.3.adm b/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.3.adm
deleted file mode 100644
index 83b33d2..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results/temp-dataset/temp_primary_plus_ngram_flush/temp_primary_plus_ngram_flush.3.adm
+++ /dev/null
@@ -1 +0,0 @@
-1000
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
index 0d84c5d..3e743dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec/agg_null_rec.3.ast
@@ -12,7 +12,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -31,7 +31,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -50,7 +50,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -69,7 +69,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -88,7 +88,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
index dbd02c5..3591305 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_null_rec_1/agg_null_rec_1.3.ast
@@ -9,7 +9,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -32,7 +32,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -58,7 +58,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -84,7 +84,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -110,7 +110,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
index 0d84c5d..3e743dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/agg_number_rec/agg_number_rec.3.ast
@@ -12,7 +12,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -31,7 +31,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -50,7 +50,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -69,7 +69,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -88,7 +88,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
index 344de1f..8100d15 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_double_null/avg_double_null.3.ast
@@ -12,7 +12,7 @@
Field=doubleField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
index f17fad0..5328b5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_empty_02/avg_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
index c82659b..55d1690 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_float_null/avg_float_nu.3.ast
@@ -12,7 +12,7 @@
Field=floatField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
index 896af7a..9d9bcf2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int16_null/avg_int16_null.3.ast
@@ -12,7 +12,7 @@
Field=int16Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
index 2293707..9849e61 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int32_null/avg_int32_null.3.ast
@@ -12,7 +12,7 @@
Field=int32Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
index 4107b9a..486d709 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int64_null/avg_int64_null.3.ast
@@ -12,7 +12,7 @@
Field=int64Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
index 210917c..c7144cc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/avg_int8_null/avg_int8_null.3.ast
@@ -12,7 +12,7 @@
Field=int8Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
index 2ccd958..6f7a134 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_empty_02/count_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
index 619729a..2338c32 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/count_null/count_null.3.ast
@@ -12,7 +12,7 @@
Field=doubleField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
index 56c8c0a..41f3e7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue395/issue395.3.ast
@@ -9,7 +9,7 @@
Field=name
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
index 5ed4c7b..8cb78d4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/issue531_string_min_max/issue531_string_min_max.3.ast
@@ -13,7 +13,7 @@
Field=name
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
@@ -32,7 +32,7 @@
Field=name
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
index 524082e..3e1a966 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/max_empty_02/max_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
index 03bb24f..05b5190 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/min_empty_02/min_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
index f5e525e..deac288 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_double_null/sum_double_null.3.ast
@@ -9,7 +9,7 @@
Field=doubleField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
index 6371498..90cbc0a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_empty_02/sum_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
index 62ea3b4..ffb277d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_float_null/sum_float_null.3.ast
@@ -9,7 +9,7 @@
Field=floatField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
index 4c7bf75..172552b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int16_null/sum_int16_null.3.ast
@@ -9,7 +9,7 @@
Field=int16Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
index b77dbf42..186c569 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int32_null/sum_int32_null.3.ast
@@ -9,7 +9,7 @@
Field=int32Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
index 4bbfacc..e9ee578 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int64_null/sum_int64_null.3.ast
@@ -9,7 +9,7 @@
Field=int64Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
index 77c987d..e13a3ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_int8_null/sum_int8_null.3.ast
@@ -9,7 +9,7 @@
Field=int8Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
index f185de3..7cc80a6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_null-with-pred/sum_null-with-pred.3.ast
@@ -9,14 +9,14 @@
Field=sal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tdst]
]
AS Variable [ Name=$l ]
]
Where
- FunctionCall null.not@1[
- FunctionCall null.is-null@1[
+ FunctionCall algebricks.not@1[
+ FunctionCall algebricks.is-null@1[
FieldAccessor [
Variable [ Name=$l ]
Field=sal
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
index 3c424ab..3bd5edb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate-sql/sum_numeric_null/sum_numeric_null.3.ast
@@ -9,7 +9,7 @@
Field=sal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tdst]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
index 77482fa..62c7daf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec/agg_null_rec.3.ast
@@ -12,7 +12,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -31,7 +31,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -50,7 +50,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -69,7 +69,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -88,7 +88,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
index efbacd2..3e883e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_null_rec_1/agg_null_rec_1.3.ast
@@ -9,7 +9,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -32,7 +32,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -58,7 +58,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -84,7 +84,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -110,7 +110,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
index 77482fa..62c7daf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/agg_number_rec/agg_number_rec.3.ast
@@ -12,7 +12,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -31,7 +31,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -50,7 +50,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -69,7 +69,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
@@ -88,7 +88,7 @@
Field=valplus
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
index 9efb867..47fb0f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_double_null/avg_double_null.3.ast
@@ -12,7 +12,7 @@
Field=doubleField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
index 6940efa..2c7af79 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_empty_02/avg_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
index 6654f36..1010058 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_float_null/avg_float_nu.3.ast
@@ -12,7 +12,7 @@
Field=floatField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
index 3852800..f39f7ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int16_null/avg_int16_null.3.ast
@@ -12,7 +12,7 @@
Field=int16Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
index 35574bd..73e7b81 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int32_null/avg_int32_null.3.ast
@@ -12,7 +12,7 @@
Field=int32Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
index 5e11c78..10d5377 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int64_null/avg_int64_null.3.ast
@@ -12,7 +12,7 @@
Field=int64Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
index dc177ee..37362ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/avg_int8_null/avg_int8_null.3.ast
@@ -12,7 +12,7 @@
Field=int8Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
index ccf8f0d..8e5b943 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_empty_02/count_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
index 93a2b72..0a0b961 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/count_null/count_null.3.ast
@@ -12,7 +12,7 @@
Field=doubleField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
index 98a5343..f8bb459 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue395/issue395.3.ast
@@ -9,7 +9,7 @@
Field=name
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
index 39e4ae9..7ee3917 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/issue531_string_min_max/issue531_string_min_max.3.ast
@@ -13,7 +13,7 @@
Field=name
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
@@ -32,7 +32,7 @@
Field=name
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
index 7a363e7..06ce07f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/max_empty_02/max_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
index 472d7f6..27e05aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/min_empty_02/min_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
index 59dad88..a97e3e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_double_null/sum_double_null.3.ast
@@ -9,7 +9,7 @@
Field=doubleField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
index afc0582..aaf6eb4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_empty_02/sum_empty_02.3.ast
@@ -9,7 +9,7 @@
Field=val
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Test]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
index 069ed30..1ed4214 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_float_null/sum_float_null.3.ast
@@ -9,7 +9,7 @@
Field=floatField
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
index a54b145..bddbffc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int16_null/sum_int16_null.3.ast
@@ -9,7 +9,7 @@
Field=int16Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
index 1380de9..93dc767 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int32_null/sum_int32_null.3.ast
@@ -9,7 +9,7 @@
Field=int32Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
index 7a1859d..8b3eecd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int64_null/sum_int64_null.3.ast
@@ -9,7 +9,7 @@
Field=int64Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
index 33e0e30..7d15e6e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_int8_null/sum_int8_null.3.ast
@@ -9,7 +9,7 @@
Field=int8Field
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
index 32b5d9a..ebbd1f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_null-with-pred/sum_null-with-pred.3.ast
@@ -9,14 +9,14 @@
Field=sal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tdst]
]
AS Variable [ Name=$l ]
]
Where
- FunctionCall null.not@1[
- FunctionCall null.is-null@1[
+ FunctionCall algebricks.not@1[
+ FunctionCall algebricks.is-null@1[
FieldAccessor [
Variable [ Name=$l ]
Field=sal
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
index 2270d23..491af3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/aggregate/sum_numeric_null/sum_numeric_null.3.ast
@@ -9,7 +9,7 @@
Field=sal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tdst]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
index 3fc7b9f..35d953b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby-2/big_object_groupby.3.ast
@@ -21,7 +21,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Line]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
index 9747f1e..5a85eb5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_groupby/big_object_groupby.3.ast
@@ -13,7 +13,7 @@
:
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [i]
Variable [ Name=$partkey ]
Variable [ Name=$g ]
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Line]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
index 1d781bc..c3aaa98 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_join/big_object_join.3.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Order]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
index 61d5c19..5acf1e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/big-object/big_object_sort/big_object_sort.3.ast
@@ -38,7 +38,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Order]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
index fed3916..b9d37f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/equal_join/equal_join.3.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [UserCopy]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
index fed3916..b9d37f8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/index_join/index_join.3.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [UserCopy]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
index 4123c5a..38a3daa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/binary/insert/insert.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [UserOpen]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/not_01/not_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/not_01/not_01.3.ast
index c554923..10f49ae 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/not_01/not_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/boolean/not_01/not_01.3.ast
@@ -4,21 +4,21 @@
(
LiteralExpr [STRING] [not_x]
:
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
LiteralExpr [TRUE]
]
)
(
LiteralExpr [STRING] [not_y]
:
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
LiteralExpr [FALSE]
]
)
(
LiteralExpr [STRING] [not_z]
:
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
LiteralExpr [NULL]
]
)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
index bfadfc4..cdc2021 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/comparison/datetime_range/datetime_range.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterData]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
index 7843472..580a1db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv01/cross-dv01.3.ast
@@ -23,22 +23,22 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [student.ugdstd]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [teacher.prof]
]
AS Variable [ Name=$p ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [student.gdstd]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [teacher.pstdoc]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast
index d45d4ec..6c05c55 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv02/cross-dv02.3.ast
@@ -2,7 +2,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Dataset]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
index 9613c78..cc2bb09 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv03/cross-dv03.3.ast
@@ -5,7 +5,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Dataset]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
index d45d4ec..6c05c55 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv04/cross-dv04.3.ast
@@ -2,7 +2,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Dataset]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
index 5857a1f..cda6d54 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv07/cross-dv07.3.ast
@@ -2,7 +2,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test.employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
index 4fd48a7..4748ac3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv15/cross-dv15.3.ast
@@ -35,7 +35,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
index fc3acc8..c2f1488 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv19/cross-dv19.3.ast
@@ -2,7 +2,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Dataset]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
index 7843472..580a1db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/cross-dv20/cross-dv20.3.ast
@@ -23,22 +23,22 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [student.ugdstd]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [teacher.prof]
]
AS Variable [ Name=$p ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [student.gdstd]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [teacher.pstdoc]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
index 01e321b..d159490 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/insert_across_dataverses/insert_across_dataverses.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test2.Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
index 84b9dcf..b0250e7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/cross-dataverse/join_across_dataverses/join_across_dataverses.3.ast
@@ -43,12 +43,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test1.Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test2.Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
index 8188ad5..c9de05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_01/customer_q_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
index a439f9d..cb761b9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_02/customer_q_02.3.ast
@@ -25,7 +25,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast
index 49bc6ce..f44d749 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_03/customer_q_03.3.ast
@@ -32,7 +32,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast
index 3109b22..23d88f9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_04/customer_q_04.3.ast
@@ -33,7 +33,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast
index f2f701b..8d5dbc6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_05/customer_q_05.3.ast
@@ -25,7 +25,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
index 5d80076..af205f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_06/customer_q_06.3.ast
@@ -17,7 +17,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
index b8e9644..f3b15b6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_07/customer_q_07.3.ast
@@ -17,7 +17,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_08/customer_q_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_08/customer_q_08.3.ast
index 6ebc2b9..a77030b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_08/customer_q_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/customer_q_08/customer_q_08.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.3.ast
index 7af85d1..960a5a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/denorm-cust-order_02/denorm-cust-order_02.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$co ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CustomerOrders2]
]
AS Variable [ Name=$co ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_01/join_q_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_01/join_q_01.3.ast
index d36f4fb..2df3f5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_01/join_q_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_01/join_q_01.3.ast
@@ -42,12 +42,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_02/join_q_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_02/join_q_02.3.ast
index e7bcf70..952af06 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_02/join_q_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_02/join_q_02.3.ast
@@ -30,12 +30,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
index 239ceac..801af46 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_03/join_q_03.3.ast
@@ -62,12 +62,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
index 92d78da..46b3624 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/join_q_04/join_q_04.3.ast
@@ -20,7 +20,7 @@
Field=oid
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -48,7 +48,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/load-test/load-test.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/load-test/load-test.4.ast
index cd92dce..88f5799 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/load-test/load-test.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/load-test/load-test.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [c2]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_01/order_q_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_01/order_q_01.3.ast
index d6b4d05..c575e56 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_01/order_q_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_01/order_q_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_02/order_q_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_02/order_q_02.3.ast
index 1966962..1b6fa19 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_02/order_q_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_02/order_q_02.3.ast
@@ -32,7 +32,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
index d844943..9442cf6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_03/order_q_03.3.ast
@@ -49,7 +49,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
index 755c260..75e35b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_04/order_q_04.3.ast
@@ -57,7 +57,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
index 3b6ed3d..04900c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_05/order_q_05.3.ast
@@ -54,7 +54,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_06/order_q_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_06/order_q_06.3.ast
index 0221c9d..255559c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_06/order_q_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/custord/order_q_06/order_q_06.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q1/q1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q1/q1.3.ast
index a4005db..adf758a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q1/q1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q1/q1.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [User]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
index 03f37bb..33df02e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dapd/q2/q2.3.ast
@@ -19,7 +19,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Event]
]
AS Variable [ Name=$event ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
index 89cac37..39ed05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-cltype/create-drop-cltype.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-cltype/create-drop-cltype.3.ast
index c698b2d..21cb274 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-cltype/create-drop-cltype.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-cltype/create-drop-cltype.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Datatype]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-opntype/create-drop-opntype.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-opntype/create-drop-opntype.3.ast
index c698b2d..21cb274 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-opntype/create-drop-opntype.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/create-drop-opntype/create-drop-opntype.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Datatype]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
index 89cac37..39ed05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
index 38a6ea9..8a19724 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-multi-statement/delete-multi-statement.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-multi-statement/delete-multi-statement.3.ast
index 8968082..0b6dd68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-multi-statement/delete-multi-statement.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-multi-statement/delete-multi-statement.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-syntax-change/delete-syntax-change.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-syntax-change/delete-syntax-change.3.ast
index 38a6ea9..8a19724 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-syntax-change/delete-syntax-change.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/delete-syntax-change/delete-syntax-change.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
index 2bf9eb7..3dd31cd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Index]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-index/drop-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-index/drop-index.4.ast
index 6802467..da430f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-index/drop-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/drop-index/drop-index.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/empty-load-with-index/empty-load-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/empty-load-with-index/empty-load-with-index.3.ast
index d52d730..4241899 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/empty-load-with-index/empty-load-with-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/empty-load-with-index/empty-load-with-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
index 4a6c0e4e5f..514247c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test.employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
index bb37414..c733ebc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [myData]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
index bb37414..c733ebc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-and-scan-joined-datasets/insert-and-scan-joined-datasets.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [myData]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
index 7553fc3..828aac6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.3.ast
index 7553fc3..828aac6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-empty-dataset/insert-into-empty-dataset.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
index 961abaf..6c23752 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
index 7553fc3..828aac6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.3.ast
index 7553fc3..828aac6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_01/insert-into-loaded-dataset_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.3.ast
index 7a4233f..c03bc93 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-into-loaded-dataset_02/insert-into-loaded-dataset_02.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tmp]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.3.ast
index 660fb7f..898f2be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-src-dst-01/insert-src-dst-01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-syntax/insert-syntax.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-syntax/insert-syntax.3.ast
index e739a6d9..f09207d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-syntax/insert-syntax.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-syntax/insert-syntax.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast
index 0482435..5142530 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_01/insert-with-autogenerated-pk_adm_01.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast
index 0482435..5142530 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_02/insert-with-autogenerated-pk_adm_02.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast
index c02fa79..ef2ac94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert-with-autogenerated-pk_adm_03/insert-with-autogenerated-pk_adm_03.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert/insert.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert/insert.3.ast
index 4d878f1..61c53e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert/insert.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert/insert.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert_less_nc/insert_less_nc.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert_less_nc/insert_less_nc.3.ast
index 4d878f1..61c53e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert_less_nc/insert_less_nc.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/insert_less_nc/insert_less_nc.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast
index 71f5bd2..7231200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_01/load-with-autogenerated-pk_adm_01.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast
index 71f5bd2..7231200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_02/load-with-autogenerated-pk_adm_01.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast
index 71f5bd2..7231200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_03/load-with-autogenerated-pk_adm_03.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast
index 71f5bd2..7231200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_adm_04/load-with-autogenerated-pk_adm_04.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast
index 71f5bd2..7231200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_01/load-with-autogenerated-pk_csv_01.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast
index 71f5bd2..7231200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_csv_02/load-with-autogenerated-pk_csv_02.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast
index 165cb7b..2b06e956 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-autogenerated-pk_txt_01/load-with-autogenerated-pk_txt_01.3.ast
@@ -6,7 +6,7 @@
Field=title
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index-open/load-with-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index-open/load-with-index-open.3.ast
index c26b29e..b57089c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index-open/load-with-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index-open/load-with-index-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItemOpen]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index/load-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index/load-with-index.3.ast
index ad91508..068a21a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index/load-with-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-index/load-with-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast
index 857c325..4044858 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index-open/load-with-ngram-index-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast
index a4f5e43..2cadd94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-ngram-index/load-with-ngram-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast
index 7418fdc4..d076eac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index-open/load-with-rtree-index-open.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyDataOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast
index f814183..6aa79ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-rtree-index/load-with-rtree-index.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
index 05ff6d0..d0abea8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index-open/load-with-word-index-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
index 1795965..bfff7bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/load-with-word-index/load-with-word-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.3.ast
index 5082316..c2a3190 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o-recursive/opentype-c2o-recursive.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds2]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o/opentype-c2o.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o/opentype-c2o.3.ast
index 5082316..c2a3190 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o/opentype-c2o.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-c2o/opentype-c2o.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds2]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.3.ast
index e739a6d9..f09207d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-closed-optional/opentype-closed-optional.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert/opentype-insert.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert/opentype-insert.3.ast
index 28f0e23..eec5ff4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert/opentype-insert.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert/opentype-insert.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert2/opentype-insert2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert2/opentype-insert2.3.ast
index 00bab71..7a9fa0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert2/opentype-insert2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-insert2/opentype-insert2.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-noexpand/opentype-noexpand.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-noexpand/opentype-noexpand.3.ast
index e739a6d9..f09207d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-noexpand/opentype-noexpand.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-noexpand/opentype-noexpand.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.3.ast
index 5082316..c2a3190 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c-recursive/opentype-o2c-recursive.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds2]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c/opentype-o2c.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c/opentype-o2c.3.ast
index 5082316..c2a3190 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c/opentype-o2c.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2c/opentype-o2c.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds2]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2o/opentype-o2o.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2o/opentype-o2o.3.ast
index 5082316..c2a3190 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2o/opentype-o2o.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/opentype-o2o/opentype-o2o.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds2]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
index ef7410a..5740d98 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue205/query-issue205.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Employees]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
index c812590..f81be20 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue288/query-issue288.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineID2]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue382/query-issue382.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue382/query-issue382.3.ast
index 7861c35..4df08f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue382/query-issue382.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue382/query-issue382.3.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$h ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [HandbookUsers]
]
AS Variable [ Name=$h ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
index 76f5ca2..d4a3bc8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/query-issue433/query-issue433.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [myDataset]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
index c6ad91b..329d149 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.5.ast
index 0001d01..697c747 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-btree-secondary-index-open/scan-delete-btree-secondary-index-open.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CustomersOpen]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
index a4f5e43..2cadd94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast
index 857c325..4044858 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index-open/scan-delete-inverted-index-ngram-secondary-index-open.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
index a4f5e43..2cadd94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
index 1795965..bfff7bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
index 05ff6d0..d0abea8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index-open/scan-delete-inverted-index-word-secondary-index-open.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
index 1795965..bfff7bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
index f814183..6aa79ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast
index 7418fdc4..d076eac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index-open/scan-delete-rtree-secondary-index-open.5.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyDataOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
index f814183..6aa79ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast
index cb88c12..4678586 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CustomersMini]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.5.ast
index 0001d01..697c747 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-btree-secondary-index-open/scan-insert-btree-secondary-index-open.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CustomersOpen]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
index ea6fcbe..c87c87a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP1]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast
index 857c325..4044858 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index-open/scan-insert-inverted-index-ngram-secondary-index-open.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
index ea6fcbe..c87c87a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP1]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
index 30b0e34..19669f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP1]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
index 05ff6d0..d0abea8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index-open/scan-insert-inverted-index-word-secondary-index-open.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
index 30b0e34..19669f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP1]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
index bc7ec93..0b75e50 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast
index 9451ea3..a1783c2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index-open/scan-insert-rtree-secondary-index-open.5.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyOpenData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
index bc7ec93..0b75e50 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.5.ast
index 89cac37..39ed05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-constant-merge-policy/using-constant-merge-policy.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.5.ast
index 89cac37..39ed05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-correlated-prefix-merge-policy/using-correlated-prefix-merge-policy.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.5.ast
index 89cac37..39ed05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-no-merge-policy/using-no-merge-policy.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.5.ast
index 89cac37..39ed05e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/dml/using-prefix-merge-policy/using-prefix-merge-policy.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_01/q_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_01/q_01.3.ast
index 0718a9d..2888bf9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_01/q_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_01/q_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$e ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Emp]
]
AS Variable [ Name=$e ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
index 0e5b3d9..b52b9ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/employee/q_02/q_02.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Emp]
]
AS Variable [ Name=$e ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 927f192..b1d340b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -66,7 +66,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast
index 016d582..b5d0024 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -70,7 +70,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rc-format/rc-format.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rc-format/rc-format.3.ast
index ed64b71..1ebd509 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rc-format/rc-format.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rc-format/rc-format.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [EmployeeDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast
index 7c356c1..2f63556 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/rtree-index/rtree-index.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/sequence-format/sequence-format.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/sequence-format/sequence-format.3.ast
index ed64b71..1ebd509 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/sequence-format/sequence-format.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/sequence-format/sequence-format.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [EmployeeDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/text-format/text-format.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/text-format/text-format.3.ast
index e5649c0..3533ffe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/text-format/text-format.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/external-indexing/text-format/text-format.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$emp ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [EmployeeDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast
index d23ef11..faf57c7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/equality-predicate/equality-predicate.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast
index 0a178d8..b559e69 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-btree/insert-with-secondary-btree.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages2]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast
index 55a463c..d7619a3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-ngram/insert-with-secondary-inverted-ngram.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast
index 6d330a8..dbcfc3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-inverted-word/insert-with-secondary-inverted-word.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast
index b83a453..60514b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert-with-secondary-rtree/insert-with-secondary-rtree.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast
index 286161b..437e0af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/insert/insert.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages2]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast
index 60a0e7b..9eed88e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-btree/load-with-secondary-btree.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast
index 55a463c..d7619a3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-ngram/load-with-secondary-inverted-ngram.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast
index 6d330a8..dbcfc3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-inverted-word/load-with-secondary-inverted-word.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast
index b83a453..60514b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast
index 1d51f60..bdb6441 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load-with-secondary-rtree/load-with-secondary-rtree.6.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast
index d2ac504..1f79bd4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/filters/load/load.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at01/at01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at01/at01.3.ast
index 04f0c6d..cf262bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at01/at01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at01/at01.3.ast
@@ -29,7 +29,7 @@
SELECT ELEMENT [
Variable [ Name=$fb ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fb ]
@@ -43,6 +43,6 @@
)
AS Variable [ Name=$i ]
- AT
+ AT
Variable [ Name=$p ]
]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at02/at02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at02/at02.3.ast
index e97fefb..0ac70c1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at02/at02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at02/at02.3.ast
@@ -50,19 +50,19 @@
)
AS Variable [ Name=$a ]
- AT
+ AT
Variable [ Name=$p ]
]
)
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$u ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast
index 78388da..2af46fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at03/at03.3.ast
@@ -50,7 +50,7 @@
)
AS Variable [ Name=$f ]
- AT
+ AT
Variable [ Name=$ip ]
]
)
@@ -61,7 +61,7 @@
SELECT ELEMENT [
Variable [ Name=$fb ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fb ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at04/at04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at04/at04.3.ast
index e99b1b6..fd7bd4e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at04/at04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at04/at04.3.ast
@@ -50,7 +50,7 @@
)
AS Variable [ Name=$f ]
- AT
+ AT
Variable [ Name=$ip ]
]
)
@@ -61,7 +61,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at05/at05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at05/at05.3.ast
index 33ebf91..3d20ca8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at05/at05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at05/at05.3.ast
@@ -33,7 +33,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$x ]
@@ -106,7 +106,7 @@
)
AS Variable [ Name=$y ]
- AT
+ AT
Variable [ Name=$i ]
]
)
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
index 11063f7..851c946 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/flwor/at06/at06.3.ast
@@ -55,7 +55,7 @@
LiteralExpr [STRING] [partkey]
:
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [i]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -65,7 +65,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -109,7 +109,7 @@
)
AS Variable [ Name=$j ]
- AT
+ AT
Variable [ Name=$p ]
]
Where
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
index c7de79e..130f1fe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_1/dblp-1_1.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
index fd84015..da5057d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1.1/dblp-1_2.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -37,7 +37,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$token ]
Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
index fd84015..da5057d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2.1/dblp-1_2.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -37,7 +37,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$token ]
Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
index e1dceff..82bc1af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-1_2/dblp-1_2.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -37,7 +37,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [paperid]
Variable [ Name=$token ]
Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
index 75bbdb2..41f326c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.1_5.3.1/dblp-2.3.ast
@@ -20,19 +20,19 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -73,7 +73,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -106,7 +106,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
index 939f281..0670274 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2.2/dblp-2.3.ast
@@ -20,20 +20,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -74,7 +74,7 @@
FROM [ Variable [ Name=$tokensUnrankedDBLP ]
AS Variable [ Name=$tokenUnranked ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TOKENSRANKEDADM]
]
AS Variable [ Name=$tokenRanked ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
index d0f1d48..5f90d16 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_1/dblp-2_1.3.ast
@@ -18,7 +18,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -41,7 +41,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
index fd432c3..aa31821 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_2/dblp-2_2.3.ast
@@ -18,7 +18,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -41,7 +41,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -74,7 +74,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$token ]
Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
index db9a73c..2bc4c27 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_3/dblp-2_3.3.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -44,7 +44,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -77,7 +77,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$token ]
Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
index b132778..79263fe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_4/dblp-2_4.3.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -47,7 +47,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -80,7 +80,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$token ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
index daa4c54..6285071 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.1/dblp-2_5.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -57,7 +57,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -90,7 +90,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
index daa4c54..6285071 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.2/dblp-2_5.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -57,7 +57,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -90,7 +90,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
index daa4c54..6285071 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3.1/dblp-2_5.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -57,7 +57,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -90,7 +90,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
index daa4c54..6285071 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5.3/dblp-2_5.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -57,7 +57,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -90,7 +90,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
index 01a66e5..93a6318 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-2_5/dblp-2_5.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -57,7 +57,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -90,7 +90,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$token ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
index 17eeb99..cda779d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.1/dblp-3_1.3.ast
@@ -40,7 +40,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=#5 ]
Variable [ Name=$lenLeft ]
@@ -59,19 +59,19 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensLeft]
Variable [ Name=$paperLeft ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenLeft]
Variable [ Name=$paperLeft ]
]
@@ -80,13 +80,13 @@
]
AS Variable [ Name=$prefixTokenLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -94,7 +94,7 @@
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -133,7 +133,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -218,7 +218,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -337,12 +337,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
index 17eeb99..cda779d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1.2/dblp-3_1.3.ast
@@ -40,7 +40,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=#5 ]
Variable [ Name=$lenLeft ]
@@ -59,19 +59,19 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensLeft]
Variable [ Name=$paperLeft ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenLeft]
Variable [ Name=$paperLeft ]
]
@@ -80,13 +80,13 @@
]
AS Variable [ Name=$prefixTokenLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -94,7 +94,7 @@
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -133,7 +133,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -218,7 +218,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -337,12 +337,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
index bed4f76..196972b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-3_1/dblp-3_1.3.ast
@@ -23,12 +23,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
@@ -50,7 +50,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=#5 ]
Variable [ Name=$lenLeft ]
@@ -69,20 +69,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperLeft ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensLeft]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenLeft]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -92,13 +92,13 @@
]
AS Variable [ Name=$prefixTokenLeft ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperRight ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -106,7 +106,7 @@
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lenRight]
Variable [ Name=$paperLeft ]
Variable [ Name=$paperRight ]
@@ -145,7 +145,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -230,7 +230,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
index 175ec78..bf63599 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_1/dblp-aqlplus_1.3.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
index 6afb337..c0cb610 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-aqlplus_2/dblp-aqlplus_2.3.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
index 8bca6c2..0318cb3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_1/dblp-csx-2_1.3.ast
@@ -23,20 +23,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -46,13 +46,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -61,7 +61,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -91,7 +91,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -166,7 +166,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
index 39e3ad0..05d6767 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_2/dblp-csx-2_2.3.ast
@@ -23,20 +23,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -46,13 +46,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -61,7 +61,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -91,7 +91,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -124,7 +124,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$prefixTokenCSX ]
Variable [ Name=$token ]
@@ -181,7 +181,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -214,7 +214,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=#4 ]
Variable [ Name=$prefixTokenCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
index 6a46c78..b6dfb5d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_3/dblp-csx-2_3.3.ast
@@ -23,20 +23,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -46,13 +46,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -61,7 +61,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -97,7 +97,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -130,7 +130,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$prefixTokenCSX ]
Variable [ Name=$token ]
@@ -194,7 +194,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -227,7 +227,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$paper ]
Variable [ Name=$tokensDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
index 1d1c7b3..4f16623 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_4/dblp-csx-2_4.3.ast
@@ -23,20 +23,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -46,13 +46,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -61,7 +61,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -100,7 +100,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -133,7 +133,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$prefixTokenCSX ]
Variable [ Name=$token ]
@@ -201,7 +201,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -234,7 +234,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$tokensUnrankedDBLP ]
Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
index 2922b08..ec2346b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.1/dblp-csx-2_5.3.ast
@@ -17,7 +17,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -38,20 +38,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -61,13 +61,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -76,7 +76,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -120,7 +120,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -153,7 +153,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -227,7 +227,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -260,7 +260,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
index 2922b08..ec2346b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.2/dblp-csx-2_5.3.ast
@@ -17,7 +17,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -38,20 +38,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -61,13 +61,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -76,7 +76,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -120,7 +120,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -153,7 +153,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -227,7 +227,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -260,7 +260,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
index bef1d14..79cfac1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3.1/dblp-csx-2_5.3.ast
@@ -23,20 +23,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -46,13 +46,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -61,7 +61,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -105,7 +105,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -138,7 +138,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -212,7 +212,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -245,7 +245,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
index 2922b08..ec2346b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5.3/dblp-csx-2_5.3.ast
@@ -17,7 +17,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -38,20 +38,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -61,13 +61,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -76,7 +76,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -120,7 +120,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -153,7 +153,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -227,7 +227,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -260,7 +260,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
index bef1d14..79cfac1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-2_5/dblp-csx-2_5.3.ast
@@ -23,20 +23,20 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -46,13 +46,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -61,7 +61,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -105,7 +105,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -138,7 +138,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -212,7 +212,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -245,7 +245,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
index a37d367..26e2200 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_1/dblp-csx-3_1.3.ast
@@ -46,20 +46,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -69,13 +69,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -84,7 +84,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -114,7 +114,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -189,7 +189,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -311,12 +311,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
index 052f7c0..b1c130b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_2/dblp-csx-3_2.3.ast
@@ -46,20 +46,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -69,13 +69,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -84,7 +84,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -114,7 +114,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -147,7 +147,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$prefixTokenCSX ]
Variable [ Name=$token ]
@@ -204,7 +204,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -237,7 +237,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=#4 ]
Variable [ Name=$prefixTokenCSX ]
@@ -342,12 +342,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
index 09a2efd..c17294b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_3/dblp-csx-3_3.3.ast
@@ -46,20 +46,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -69,13 +69,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -84,7 +84,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -120,7 +120,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -153,7 +153,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$prefixTokenCSX ]
Variable [ Name=$token ]
@@ -217,7 +217,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -250,7 +250,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$paper ]
Variable [ Name=$tokensDBLP ]
@@ -351,12 +351,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
index ed021c3..9403a30 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_4/dblp-csx-3_4.3.ast
@@ -46,20 +46,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -69,13 +69,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -84,7 +84,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -123,7 +123,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -156,7 +156,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$prefixTokenCSX ]
Variable [ Name=$token ]
@@ -224,7 +224,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -257,7 +257,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$tokensUnrankedDBLP ]
Variable [ Name=$paper ]
@@ -350,12 +350,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
index ae318cc..74a82c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.1/dblp-csx-3_5.3.ast
@@ -40,7 +40,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -61,20 +61,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -84,13 +84,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -99,7 +99,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -143,7 +143,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -176,7 +176,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -250,7 +250,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -283,7 +283,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -371,12 +371,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
index ae318cc..74a82c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.2/dblp-csx-3_5.3.ast
@@ -40,7 +40,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -61,20 +61,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -84,13 +84,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -99,7 +99,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -143,7 +143,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -176,7 +176,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -250,7 +250,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -283,7 +283,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -371,12 +371,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
index ae318cc..74a82c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3.1/dblp-csx-3_5.3.ast
@@ -40,7 +40,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -61,20 +61,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -84,13 +84,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -99,7 +99,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -143,7 +143,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -176,7 +176,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -250,7 +250,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -283,7 +283,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -371,12 +371,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
index fadf81a..09b0092 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.3/dblp-csx-3_5.3.ast
@@ -46,20 +46,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -69,13 +69,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -84,7 +84,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -128,7 +128,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -161,7 +161,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -235,7 +235,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -268,7 +268,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -359,12 +359,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
index d498017..1a9973c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4.1/dblp-csx-3_5.3.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
@@ -65,7 +65,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -87,7 +87,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -108,13 +108,13 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
Variable [ Name=$paperCSX ]
@@ -122,7 +122,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
Variable [ Name=$paperCSX ]
@@ -133,13 +133,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -148,7 +148,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -192,7 +192,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -225,7 +225,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -299,7 +299,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -332,7 +332,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast
index 40d55ad..58d5ac7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5.4/dblp-csx-3_5.3.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
@@ -65,7 +65,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
@@ -87,7 +87,7 @@
LiteralExpr [STRING] [sim]
:
IndexAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [sim]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -108,13 +108,13 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
Variable [ Name=$paperCSX ]
@@ -122,7 +122,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
Variable [ Name=$paperCSX ]
@@ -133,13 +133,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -148,7 +148,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -192,7 +192,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -225,7 +225,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -299,7 +299,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGrouped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -332,7 +332,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast
index fadf81a..09b0092 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-3_5/dblp-csx-3_5.3.ast
@@ -46,20 +46,20 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensDBLP]
Variable [ Name=$paperDBLP ]
]
@@ -69,13 +69,13 @@
]
AS Variable [ Name=$prefixTokenDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
,
FunctionCall fuzzyjoin.subset-collection@3[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -84,7 +84,7 @@
LiteralExpr [LONG] [0]
FunctionCall fuzzyjoin.prefix-len-jaccard@2[
FunctionCall fuzzyjoin.len@1[
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [tokensCSX]
Variable [ Name=$prefixTokenDBLP ]
Variable [ Name=$paperDBLP ]
@@ -128,7 +128,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -161,7 +161,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -235,7 +235,7 @@
SELECT ELEMENT [
Variable [ Name=$tokenGroupped ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
@@ -268,7 +268,7 @@
FunctionCall asterix.sql-count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [id]
Variable [ Name=$lenDBLP ]
Variable [ Name=$tokensUnrankedDBLP ]
@@ -359,12 +359,12 @@
)
AS Variable [ Name=$ridpair ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paperDBLP ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$paperCSX ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast
index bd34da8..3eec5fe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_1/dblp-csx-aqlplus_1.3.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$i ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$j ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast
index c0af204..45018c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_2/dblp-csx-aqlplus_2.3.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$csx ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast
index 847cd77..76f7c78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-aqlplus_3/dblp-csx-aqlplus_3.3.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$csx ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast
index 736c5fe..f4b2de6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-csx-dblp-aqlplus_1/dblp-csx-dblp-aqlplus_1.3.ast
@@ -20,17 +20,17 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$csx ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$dblp2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.3.ast
index 24c6240..d62c7bd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/dblp-lookup_1/dblp-lookup_1.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/opentype/opentype.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/opentype/opentype.3.ast
index f00ce81..8e19396 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/opentype/opentype.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/fuzzyjoin/opentype/opentype.3.ast
@@ -19,7 +19,7 @@
Field=referred-topics
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -61,7 +61,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast
index a9e10ed..b072ef5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_02/hdfs_02.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [token]
Variable [ Name=$g ]
Variable [ Name=$tok ]
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TextDataset]
]
AS Variable [ Name=$line ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast
index a9e10ed..b072ef5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_03/hdfs_03.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [token]
Variable [ Name=$g ]
Variable [ Name=$tok ]
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TextDataset]
]
AS Variable [ Name=$line ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast
index a9e10ed..b072ef5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/hdfs_shortcircuit/hdfs_shortcircuit.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [token]
Variable [ Name=$g ]
Variable [ Name=$tok ]
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TextDataset]
]
AS Variable [ Name=$line ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.3.ast
index 4192035..832c1d8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hdfs/issue_245_hdfs/issue_245_hdfs.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TextDataset]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.3.ast
index 639c43e..f28f381 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_5/issue_251_dataset_hint_5.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPadm]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast
index a9e10ed..b072ef5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_6/issue_251_dataset_hint_6.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [token]
Variable [ Name=$g ]
Variable [ Name=$tok ]
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TextDataset]
]
AS Variable [ Name=$line ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.3.ast
index 538363d..d6efede 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/hints/issue_251_dataset_hint_7/issue_251_dataset_hint_7.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Tweets]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.3.ast
index 08c152d..25786ec 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-index-nested-loop-join/btree-index-nested-loop-join.3.ast
@@ -6,17 +6,17 @@
Field=tweetid
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$tu ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$tm ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [results]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast
index 006962c..dc00eb4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.4.ast
index 81f6fce..5bd04fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_01/btree-secondary-equi-join_01.4.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.4.ast
index 81f6fce..5bd04fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_02/btree-secondary-equi-join_02.4.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.4.ast
index 81f6fce..5bd04fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/btree-secondary-equi-join_03/btree-secondary-equi-join_03.4.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 76b9409..aa9f778 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index 016d582..b5d0024 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -70,7 +70,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 9da7404..cf74da8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
index d6bac72..61ca573 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
@@ -48,7 +48,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -96,7 +96,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index d62445c..177f24a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -48,7 +48,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -96,7 +96,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 927f192..b1d340b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -66,7 +66,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index 947d145..eb74a17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -80,7 +80,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.3.ast
index c97f432..421cce2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
index 1580e57..9317d7f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
index 5249a5b..e354ba7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
@@ -52,12 +52,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast
index c6ad91b..329d149 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.3.ast
index 674bfd5..c1410e9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/disjunctive-predicate-1/disjunctive-predicate-1.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index a4f5e43..2cadd94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index 7b7c84a..8505394 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index cedae20..40e53e9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
index fd07d6a..20a1daf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index cce39e2..751a103 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index 0ae291b..09564fb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
index 991cc6c..b603c3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
index 61c54f0..17ac1e1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
index ab21d02..801fdf2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
index 9be27d4..315ce3a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index a4f5e43..2cadd94 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index 1795965..bfff7bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast
index 14d63cb..63662fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
index 14d63cb..63662fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast
index b6d7c24..a8587ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.4.ast
index b6d7c24..a8587ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/orders-index-custkey/orders-index-custkey.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.4.ast
index 4e6446a..711bb86 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search-open/range-search-open.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.4.ast
index 4e6446a..711bb86 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/range-search/range-search.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast
index 46f9215..721a5eb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-circular-query/rtree-secondary-index-circular-query.4.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
index 7c356c1..2f63556 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
index 7c356c1..2f63556 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 7c356c1..2f63556 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index 4caec13..d467adf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast
index 7790e94..acdb60e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index c65e6f3..295dd61 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast
index 485c868..7addf44 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ngram-jaccard/ngram-jaccard.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
index c46d563..e8e34fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast
index 02f5a67..ba6fa63 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-edit-distance/olist-edit-distance.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast
index ce0b0cd..d97b99d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard-inline/olist-jaccard-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast
index 7e70652..f489c7c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/olist-jaccard/olist-jaccard.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
index ce0b0cd..d97b99d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast
index 7e70652..f489c7c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/ulist-jaccard/ulist-jaccard.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast
index cc1d06a..62fab46 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast
index fd7dbe9..da137ad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join-noeqjoin/word-jaccard/word-jaccard.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index d9ac017..7bbf3f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index b3202b8..953a974 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index 37b6be1..ef273b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast
index b53b8fb..51bd934 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
index b8f05ef..d786667 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance-inline/olist-edit-distance-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast
index 3a631f9..6ca6e9a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-edit-distance/olist-edit-distance.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast
index d4c2e8a..56ab90b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard-inline/olist-jaccard-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast
index 444291e..1815e81 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/olist-jaccard/olist-jaccard.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
index d4c2e8a..56ab90b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard-inline/ulist-jaccard-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
index 444291e..1815e81 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/ulist-jaccard/ulist-jaccard.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index 4c8a817..c6f3964 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
index 47976ed..57bae96 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/inverted-index-join/word-jaccard/word-jaccard.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
index a7e83ca..cf9648b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285-2/query_issue285-2.3.ast
@@ -20,7 +20,7 @@
Field=id
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
@@ -48,7 +48,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
index d1a7271..4208334 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue285/query_issue285.3.ast
@@ -20,7 +20,7 @@
Field=id
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
@@ -48,7 +48,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
index 8046dae..c6f63ac 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue658/query_issue658.3.ast
@@ -20,7 +20,7 @@
Field=id
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
@@ -62,7 +62,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
index 1a8dc54..c9d2d01 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849-2/query_issue849-2.3.ast
@@ -14,7 +14,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [s]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
index a35b4fa..6fcc409 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/leftouterjoin/query_issue849/query_issue849.3.ast
@@ -39,7 +39,7 @@
Field=b
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [s]
]
AS Variable [ Name=$z ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_bianry.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_bianry.3.ast
index 6147a6e..3de4722 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_bianry.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/adm_binary/adm_bianry.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
index 1fc68cf..2b9262f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_01/csv_01.3.ast
@@ -82,7 +82,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
index 5fa5ed3..c668e3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_02/csv_02.3.ast
@@ -52,7 +52,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
index 0f9c737..fd1b875 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_03/csv_03.3.ast
@@ -60,7 +60,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
index 418bbfd..7b88617 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_04/csv_04.3.ast
@@ -36,7 +36,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
index 418bbfd..7b88617 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_05/csv_05.3.ast
@@ -36,7 +36,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
index 418bbfd..7b88617 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_06/csv_06.3.ast
@@ -36,7 +36,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
index 418bbfd..7b88617 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_07/csv_07.3.ast
@@ -36,7 +36,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
index 1fc68cf..2b9262f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_cr/csv_08.3.ast
@@ -82,7 +82,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
index 1fc68cf..2b9262f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_crlf/csv_08.3.ast
@@ -82,7 +82,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
index 1fc68cf..2b9262f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/csv_08_header_lf/csv_08.3.ast
@@ -82,7 +82,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
index 9248970..463a4ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes01/escapes01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
index 9248970..463a4ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/escapes02/escapes02.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
index e5a74a8..11b1b9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/issue289_query/issue289_query.3.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
index 9248970..463a4ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/load/type_promotion_0/type_promotion_0.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
index 323bb0e..a1f0beb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/materialization/assign-reuse/assign-reuse.3.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$d ]
@@ -29,7 +29,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
index b1f231f..a0bd34e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/flushtest/flushtest.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers2]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
index 0645a7f..9c7ca3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/groupby-orderby-count/groupby-orderby-count.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [token]
Variable [ Name=$g ]
Variable [ Name=$tok ]
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterData]
]
AS Variable [ Name=$t ]
@@ -54,7 +54,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [token]
Variable [ Name=$g ]
Variable [ Name=$tok ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/is-null_01/is-null_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/is-null_01/is-null_01.3.ast
index 25b715e..ccf0bf2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/is-null_01/is-null_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/is-null_01/is-null_01.3.ast
@@ -3,10 +3,10 @@
Query:
SELECT ELEMENT [
OrderedListConstructor [
- FunctionCall null.is-null@1[
+ FunctionCall algebricks.is-null@1[
LiteralExpr [NULL]
]
- FunctionCall null.is-null@1[
+ FunctionCall algebricks.is-null@1[
LiteralExpr [LONG] [10]
]
]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
index 27f1a69..ee3d0bc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/nested-loop-join_01/nested-loop-join_01.3.ast
@@ -34,12 +34,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Users]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Visitors]
]
AS Variable [ Name=$visitor ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
index 0b3fd5c..5cf9d1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/partition-by-nonexistent-field/partition-by-nonexistent-field.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
index 78a70a7..322f3be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/prefix-search/prefix-search.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
index 5cef21d..7a7b2a8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/query_issue267/query_issue267.3.ast
@@ -3,12 +3,12 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
index 73977d7..e6ac9c9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/stable_sort/stable_sort.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
index 41fbfd9..5c46ae6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/misc/string_eq_01/string_eq_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
index b129f62..240d95f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/compact-dataset-and-its-indexes/compact-dataset-and-its-indexes.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
index 347bcd1..a0018e9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
index 59e64c5..5cf4681 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/drop-index/drop-index.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
index 63307a6..6212419 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-empty-dataset-with-index/insert-into-empty-dataset-with-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
index da5c8e8..c23081b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_01/insert-into-loaded-dataset-with-index_01.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
index 010d69e..d3ede0c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/insert-into-loaded-dataset-with-index_02/insert-into-loaded-dataset-with-index_02.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
index 010d69e..d3ede0c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-index/load-with-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
index 5d856c6..67e8a83 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-ngram-index/load-with-ngram-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
index 0f6b17a..0b78945 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-rtree-index/load-with-rtree-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
index 81ed659..aae2e1b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/load-with-word-index/load-with-word-index.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
index 7e9c615..624ec99 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-insert/nested-uuid-insert.3.ast
@@ -12,7 +12,7 @@
Field=message-text
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [doublenests]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
index 1ba5521..20e3aa3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/nested-uuid-load/nested-uuid-load.3.ast
@@ -23,7 +23,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
index e85ef69..6bdcd86 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-btree-secondary-index-nullable/scan-delete-btree-secondary-index-nullable.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index-nullable/scan-delete-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-ngram-secondary-index/scan-delete-inverted-index-ngram-secondary-index.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
index 7b62e3a..1c59c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index-nullable/scan-delete-inverted-index-word-secondary-index-nullable.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
index 7b62e3a..1c59c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-inverted-index-word-secondary-index/scan-delete-inverted-index-word-secondary-index.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
index 7922298..77a3ade 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index-nullable/scan-delete-rtree-secondary-index-nullable.5.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
index 7922298..77a3ade 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast
index 03e0f3e..38fdac0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-btree-secondary-index-nullable/scan-insert-btree-secondary-index-nullable.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CustomersMini]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index-nullable/scan-insert-inverted-index-ngram-secondary-index-nullable.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-ngram-secondary-index/scan-insert-inverted-index-ngram-secondary-index.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
index 7b62e3a..1c59c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index-nullable/scan-insert-inverted-index-word-secondary-index-nullable.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
index 7b62e3a..1c59c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-inverted-index-word-secondary-index/scan-insert-inverted-index-word-secondary-index.5.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
index 8c41a3a..8457395 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index-nullable/scan-insert-rtree-secondary-index-nullable.5.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
index 8c41a3a..8457395 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index-dml/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyMiniData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/adm-format/adm-format.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/adm-format/adm-format.3.ast
index e6ee28d..e293c9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/adm-format/adm-format.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/adm-format/adm-format.3.ast
@@ -103,7 +103,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 14fb18f..bfb0b7b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
index b06cad5..f9de787 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast
index 9c42719..be790ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/external-indexing/rtree-index/rtree-index.3.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast
index 27a3a1e..e0d8112 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-primary-equi-join/btree-primary-equi-join.3.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
index ddfe85e..dc93374 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index 55edfef..e6f5635 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index 7b84832..86e4db8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index 98199de..f79bb66 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
index f54a33a..028df99 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 45e7acd..f027b6b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index 007ed4c5..ac2d926 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast
index 0c0ec3f..8499b65 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-join/word-jaccard/word-jaccard.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index b06cad5..f9de787 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 5c212c0..c845143 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -111,7 +111,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
index 7101e57..7dfb1b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx1/probe-pidx-with-join-invidx-sidx1.3.ast
@@ -60,7 +60,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -123,7 +123,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index df40355..d37d539 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -60,7 +60,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -123,7 +123,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 14fb18f..bfb0b7b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index 4e6fcaa..eb5806b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -104,7 +104,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
index 85f10b7..f87728c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
index cbb879c..cdb5313 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
index 448c8aa..a2fa441 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
@@ -70,12 +70,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast
index e85ef69..6bdcd86 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/cust-index-age-nullable/cust-index-age-nullable.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index a430474..7c2fab2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index 5e173d3..1e6a9b9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
index fe86c69..4cd5224 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index 3e387f7..0b4a756 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index c7a9a8d..9e06dd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -7,7 +7,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
index e54f62e..6dd5e82 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance-panic/inverted-index-olist-edit-distance-panic.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
index 3a228f8..0f2eaf5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-edit-distance/inverted-index-olist-edit-distance.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
index e22169f..64c9e03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-olist-jaccard/inverted-index-olist-jaccard.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
index 72d84d0..88db1f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-ulist-jaccard/inverted-index-ulist-jaccard.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index 7b62e3a..1c59c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast
index b482e66..3b12067 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive-open/orders-index-custkey-conjunctive-open.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
index b482e66..3b12067 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast
index 3aa4530..46724e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey-open/orders-index-custkey-open.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast
index 3aa4530..46724e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search-open/range-search-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search-open/range-search-open.4.ast
index 25dade1..a24d10b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search-open/range-search-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search-open/range-search-open.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search/range-search.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search/range-search.4.ast
index 25dade1..a24d10b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search/range-search.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/range-search/range-search.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
index 9c42719..be790ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-nullable/rtree-secondary-index-nullable.4.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
index 9c42719..be790ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index-open/rtree-secondary-index-open.4.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 9c42719..be790ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.3.ast
index e6ee28d..e293c9f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/adm-format/adm-format.3.ast
@@ -103,7 +103,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 14fb18f..bfb0b7b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
index b06cad5..f9de787 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast
index 9c42719..be790ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/external-indexing/rtree-index/rtree-index.3.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.3.ast
index 2c289ee..9db984e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-closed/bottom-closed-top-closed.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$test ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.3.ast
index 2c289ee..9db984e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-closed-top-open/bottom-closed-top-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$test ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.3.ast
index 2c289ee..9db984e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-closed/bottom-open-top-closed.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$test ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.3.ast
index 2c289ee..9db984e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/highly-open-highly-nested/bottom-open-top-open/bottom-open-top-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$test ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
index ddfe85e..dc93374 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
@@ -37,12 +37,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index 55edfef..e6f5635 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index 7b84832..86e4db8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index 1bf6be6..28c263c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -26,12 +26,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
index 774a7a9..65ad731 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -21,12 +21,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 45e7acd..f027b6b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -48,12 +48,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index 007ed4c5..ac2d926 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -25,12 +25,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast
index 0c0ec3f..8499b65 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-join/word-jaccard/word-jaccard.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index b06cad5..f9de787 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -91,7 +91,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 5c212c0..c845143 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -111,7 +111,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index b12cdac..cad4f1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -111,7 +111,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesTmp]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 14fb18f..bfb0b7b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index 4e6fcaa..eb5806b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -54,7 +54,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -104,7 +104,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
index 85f10b7..f87728c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
index cbb879c..cdb5313 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
index 448c8aa..a2fa441 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
@@ -70,12 +70,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index a430474..7c2fab2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index 5e173d3..1e6a9b9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index 3e387f7..0b4a756 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index c7a9a8d..9e06dd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -7,7 +7,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index 724d3b9..bc18679 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index 7b62e3a..1c59c5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
index b482e66..3b12067 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast
index 3aa4530..46724e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/orders-index-custkey/orders-index-custkey.4.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/range-search/range-search.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/range-search/range-search.4.ast
index 25dade1..a24d10b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/range-search/range-search.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/range-search/range-search.4.ast
@@ -6,7 +6,7 @@
Field=nested
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index 9c42719..be790ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nested-open-index/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -15,7 +15,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nestrecords/nestrecord/nestrecord.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nestrecords/nestrecord/nestrecord.3.ast
index e739a6d9..f09207d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nestrecords/nestrecord/nestrecord.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/nestrecords/nestrecord/nestrecord.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.10.ast
index 596df09..355407d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.10.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.11.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.11.ast
index 2136522..8002e0a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.11.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.11.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.12.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.12.ast
index 6964ae3..910daaa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.12.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.12.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.3.ast
index 06c8956..0c8e282 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.4.ast
index 1e0dfbe..61be60d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.5.ast
index 5538c4e..3367d42 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.6.ast
index 147c38a..8336e41 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.6.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.7.ast
index d10c2e4..169dc7b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.7.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.8.ast
index d4091ba..e8bdf9d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.8.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.9.ast
index a6a2d64..61da4ee 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/access-nested-fields/access-nested-fields.9.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.ast
index 84c69fe..662f9cb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/field-access-on-open-field/field-access-on-open-field.3.ast
@@ -6,7 +6,7 @@
Field=zip
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
index 844db7f..d348c3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-closed/highly-nested-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
index 844db7f..d348c3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-mixed/highly-nested-mixed.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
index 844db7f..d348c3e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/highly-nested-open/highly-nested-open.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Animals]
]
AS Variable [ Name=$test ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
index 62d2ab4..9935372 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-field-value/tiny-social-example/tiny-social-example.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$result ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
index b1b51e1..281b48b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.4.ast
@@ -5,7 +5,7 @@
Variable [ Name=$user ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsersAlternate]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
index b623766..ffdd2e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.5.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsersAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
index 21c3121..767f44d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.6.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
index d3d80bb..ee8c594 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.7.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsersAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
index 112eff2..764d81e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.8.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
index 0e005a9..307b9db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-no-complex-types/tiny-social-example-no-complex-types.9.ast
@@ -19,7 +19,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
index b1b51e1..281b48b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.4.ast
@@ -5,7 +5,7 @@
Variable [ Name=$user ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsersAlternate]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
index b623766..ffdd2e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.5.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsersAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
index 21c3121..767f44d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.6.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
index d3d80bb..ee8c594 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.7.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsersAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
index 112eff2..764d81e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.8.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
index 0e005a9..307b9db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-lists/tiny-social-example-only-lists.9.ast
@@ -19,7 +19,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
index b1b51e1..281b48b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.4.ast
@@ -5,7 +5,7 @@
Variable [ Name=$user ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsersAlternate]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
index b623766..ffdd2e2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.5.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsersAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
index 21c3121..767f44d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.6.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
index d3d80bb..ee8c594 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.7.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsersAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
index 112eff2..764d81e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.8.ast
@@ -5,7 +5,7 @@
Variable [ Name=$r ]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
index 0e005a9..307b9db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/get-object-fields/tiny-social-example-only-records/tiny-social-example-only-records.9.ast
@@ -19,7 +19,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesAlternate]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
index c165b6f..0ce294c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-closed-fieldname-conflict_issue173/open-closed-fieldname-conflict_issue173.3.ast
@@ -19,7 +19,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
index 0ec5e92..fdb1c7a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/objects/open-open-fieldname-conflict_issue173/open-open-fieldname-conflict_issue173.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.3.ast
index 1ede8bd..6ad472b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list-ordered01/heterog-list-ordered01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [T1]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list01/heterog-list01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list01/heterog-list01.3.ast
index 1ede8bd..6ad472b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list01/heterog-list01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/heterog-list01/heterog-list01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [T1]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-01/open-closed-01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-01/open-closed-01.3.ast
index 00bab71..7a9fa0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-01/open-closed-01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-01/open-closed-01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-12/open-closed-12.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-12/open-closed-12.3.ast
index 660fb7f..898f2be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-12/open-closed-12.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-12/open-closed-12.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-14/open-closed-14.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-14/open-closed-14.3.ast
index 660fb7f..898f2be 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-14/open-closed-14.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-14/open-closed-14.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-24/open-closed-24.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-24/open-closed-24.3.ast
index 0b3fd5c..5cf9d1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-24/open-closed-24.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-24/open-closed-24.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-25/open-closed-25.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-25/open-closed-25.3.ast
index 0b3fd5c..5cf9d1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-25/open-closed-25.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-25/open-closed-25.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-26/open-closed-26.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-26/open-closed-26.3.ast
index 0b3fd5c..5cf9d1d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-26/open-closed-26.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-26/open-closed-26.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-29/open-closed-29.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-29/open-closed-29.3.ast
index 698a06e..9833c5b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-29/open-closed-29.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-29/open-closed-29.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-31/open-closed-31.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-31/open-closed-31.3.ast
index 0d4b3ff..03ff25b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-31/open-closed-31.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-31/open-closed-31.3.ast
@@ -6,7 +6,7 @@
Field=hobbies
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-32/open-closed-32.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-32/open-closed-32.3.ast
index eab1dd6..088cb5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-32/open-closed-32.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-32/open-closed-32.3.ast
@@ -6,7 +6,7 @@
Field=interests
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-33/open-closed-33.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-33/open-closed-33.3.ast
index eab1dd6..088cb5a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-33/open-closed-33.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/open-closed-33/open-closed-33.3.ast
@@ -6,7 +6,7 @@
Field=interests
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds01]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue196/query-issue196.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue196/query-issue196.3.ast
index fc3536d..51e8c25 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue196/query-issue196.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue196/query-issue196.3.ast
@@ -8,7 +8,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
@@ -29,7 +29,7 @@
SELECT ELEMENT [
Variable [ Name=$m ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast
index 9f85911..1318b33 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue208/query-issue208.3.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue236/query-issue236.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue236/query-issue236.3.ast
index 077c79a..67c2ebf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue236/query-issue236.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue236/query-issue236.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$r ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue258/query-issue258.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue258/query-issue258.3.ast
index a2bee66..0c902f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue258/query-issue258.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue258/query-issue258.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [ds1]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343-2/query-issue343-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343-2/query-issue343-2.3.ast
index d4ff417..6927890 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343-2/query-issue343-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343-2/query-issue343-2.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [All]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343/query-issue343.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343/query-issue343.3.ast
index d4ff417..6927890 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343/query-issue343.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue343/query-issue343.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [All]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350-2/query-issue350-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350-2/query-issue350-2.3.ast
index b2c1077..6df7db9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350-2/query-issue350-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350-2/query-issue350-2.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$tm ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$tm ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350/query-issue350.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350/query-issue350.3.ast
index f2dbadd..ea93d90 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350/query-issue350.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue350/query-issue350.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$tm ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$tm ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue377/query-issue377.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue377/query-issue377.3.ast
index c246b60..61546aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue377/query-issue377.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue377/query-issue377.3.ast
@@ -44,7 +44,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
@@ -71,7 +71,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue410/query-issue410.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue410/query-issue410.3.ast
index 8411681..5b6a4ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue410/query-issue410.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue410/query-issue410.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Employee]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423-2/query-issue423-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423-2/query-issue423-2.3.ast
index 4898dd3..49dffe9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423-2/query-issue423-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423-2/query-issue423-2.3.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423/query-issue423.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423/query-issue423.3.ast
index 290e76b..29d686e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423/query-issue423.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue423/query-issue423.3.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t1]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$m ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453-2/query-issue453-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453-2/query-issue453-2.3.ast
index f3eb5ac..6eca55e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453-2/query-issue453-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453-2/query-issue453-2.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DataOpen]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453/query-issue453.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453/query-issue453.3.ast
index f3eb5ac..6eca55e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453/query-issue453.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue453/query-issue453.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DataOpen]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
index c9e0567..09d263d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue456/query-issue456.3.ast
@@ -18,7 +18,7 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DataOpen]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue487/query-issue487.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue487/query-issue487.3.ast
index 57772bf..958437c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue487/query-issue487.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue487/query-issue487.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Employee]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue592/query-issue592.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue592/query-issue592.3.ast
index 6d0a36d..fc87678 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue592/query-issue592.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue592/query-issue592.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$f ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [fooset]
]
AS Variable [ Name=$f ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue625/query-issue625.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue625/query-issue625.3.ast
index 7df5c42..e47d42c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue625/query-issue625.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-issue625/query-issue625.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Foo]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast
index 36a2f6b..ae4f8b6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal/query-proposal.3.ast
@@ -36,7 +36,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$tweet ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast
index 2c7cc21..8355125 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-closed/query-proposal02/query-proposal02.3.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$tweet ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.3.ast
index c21eaf2..122e731 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/adm-format/adm-format.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$d ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$d ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
index 927f192..b1d340b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin-rtree/leftouterjoin-rtree.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -66,7 +66,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast
index 016d582..b5d0024 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/leftouterjoin/leftouterjoin.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -70,7 +70,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast
index 7c356c1..2f63556 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/external-indexing/rtree-index/rtree-index.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
index b98ea54..3b6b736 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/btree-secondary-equi-join/btree-secondary-equi-join.4.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
index d9ac017..7bbf3f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance-inline/ngram-edit-distance-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
index b3202b8..953a974 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-edit-distance/ngram-edit-distance.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
index 22a6a81..0a1bed1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard-inline/ngram-jaccard-inline.4.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast
index 2424075..1f0f9fc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/ngram-jaccard/ngram-jaccard.4.ast
@@ -15,12 +15,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
index 76b9409..aa9f778 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/rtree-spatial-intersect-point/rtree-spatial-intersect-point.4.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData1]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData2]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
index f8f167b..33f30b7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard-inline/word-jaccard-inline.4.ast
@@ -19,12 +19,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast
index d7de2c4..41d94ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-join/word-jaccard/word-jaccard.4.ast
@@ -14,12 +14,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$a ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CSX]
]
AS Variable [ Name=$b ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
index 016d582..b5d0024 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx1/probe-pidx-with-join-btree-sidx1.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -70,7 +70,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
index 9da7404..cf74da8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-btree-sidx2/probe-pidx-with-join-btree-sidx2.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -84,7 +84,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
index 2d27947..ea36637 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-invidx-sidx2/probe-pidx-with-join-invidx-sidx2.3.ast
@@ -48,7 +48,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -96,7 +96,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessagesTmp]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
index 927f192..b1d340b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx1/probe-pidx-with-join-rtree-sidx1.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -66,7 +66,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
index 947d145..eb74a17 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-leftouterjoin/probe-pidx-with-join-rtree-sidx2/probe-pidx-with-join-rtree-sidx2.3.ast
@@ -42,7 +42,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -80,7 +80,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
index 366d06e..c3a68af 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key-mixed-intervals/btree-index-composite-key-mixed-intervals.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employeeOpen]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
index 914bf05..8e6f326 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-composite-key/btree-index-composite-key.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [employeeOpen]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
index 786562f..6f1ef0d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/btree-index-rewrite-multiple/btree-index-rewrite-multiple.4.ast
@@ -52,12 +52,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [OrdersOpen]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [OrdersOpen]
]
AS Variable [ Name=$o2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
index 4ea1306..27bea64 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-contains/inverted-index-ngram-contains.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
index 7b7c84a..8505394 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-contains/inverted-index-ngram-edit-distance-contains.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
index 649dfd5..dda3c73 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-panic/inverted-index-ngram-edit-distance-panic.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
index fd07d6a..20a1daf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance-word-tokens/inverted-index-ngram-edit-distance-word-tokens.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
index 70df0ed..5a70f8d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-edit-distance/inverted-index-ngram-edit-distance.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
index 21b9588..917597b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-ngram-jaccard/inverted-index-ngram-jaccard.4.ast
@@ -45,7 +45,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
index 4ea1306..27bea64 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-contains/inverted-index-word-contains.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
index baec7df..5292da2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/inverted-index-word-jaccard/inverted-index-word-jaccard.4.ast
@@ -44,7 +44,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
index 0a8aa7c..3cb9d68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey-conjunctive/orders-index-custkey-conjunctive.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [OrdersOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.4.ast
index cb8548e..26f5922 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/orders-index-custkey/orders-index-custkey.4.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [OrdersOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/range-search/range-search.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/range-search/range-search.4.ast
index 5710661..ddff238 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/range-search/range-search.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/range-search/range-search.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$c ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItemOpen]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
index c6f3177..a03c65c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/open-index-enforced/index-selection/rtree-secondary-index/rtree-secondary-index.4.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyDataOpen]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/everysat_04/everysat_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/everysat_04/everysat_04.3.ast
index 9a08a18..e2fc21b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/everysat_04/everysat_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/everysat_04/everysat_04.3.ast
@@ -60,7 +60,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
@@ -74,7 +74,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
@@ -88,7 +88,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
@@ -102,7 +102,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_02/somesat_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_02/somesat_02.3.ast
index 0fee643..fe2b7ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_02/somesat_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_02/somesat_02.3.ast
@@ -6,7 +6,7 @@
Field=cid
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [CustomerSomeSat02]
]
AS Variable [ Name=$x ]
@@ -15,7 +15,7 @@
QuantifiedExpression SOME [
[Variable [ Name=$y ]
In
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [OrdersSomeSat02]
]
]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_06/somesat_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_06/somesat_06.3.ast
index 4a499d7..151dfbd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_06/somesat_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/quantifiers/somesat_06/somesat_06.3.ast
@@ -61,7 +61,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
@@ -75,7 +75,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
@@ -89,7 +89,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
@@ -103,7 +103,7 @@
]
]
Satifies [
- FunctionCall null.not@1[
+ FunctionCall algebricks.not@1[
Variable [ Name=$x ]
]
]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.4.ast
index e4b5374..4a085fe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.5.ast
index 9c74363..a306bfe 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.6.ast
index 081ab7b..70c2cc9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.6.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.7.ast
index 6b1a0fc..5c8bc5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/range-hints/order-by/order-by.7.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/10/10.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/10/10.3.ast
index 89a91ac..36b0609 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/10/10.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/10/10.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP1]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/20/20.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/20/20.3.ast
index 639c43e..f28f381 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/20/20.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/20/20.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPadm]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/30/30.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/30/30.3.ast
index 4da87c8..263ba03 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/30/30.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/30/30.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPsplits]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_01/alltypes_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_01/alltypes_01.3.ast
index bb0ad88..c7f503a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_01/alltypes_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_01/alltypes_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [All]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_02/alltypes_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_02/alltypes_02.3.ast
index bb0ad88..c7f503a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_02/alltypes_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/alltypes_02/alltypes_02.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [All]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.3.ast
index 96f1482..a70412e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/invalid-scan-syntax/invalid-scan-syntax.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test.Office]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_1/issue238_query_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_1/issue238_query_1.3.ast
index 639c43e..f28f381 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_1/issue238_query_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_1/issue238_query_1.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPadm]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_2/issue238_query_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_2/issue238_query_2.3.ast
index 639c43e..f28f381 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_2/issue238_query_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/issue238_query_2/issue238_query_2.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLPadm]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/numeric_types_01/numeric_types_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/numeric_types_01/numeric_types_01.3.ast
index 7a43203..a063273 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/numeric_types_01/numeric_types_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/numeric_types_01/numeric_types_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Numeric]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/spatial_types_01/spatial_types_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/spatial_types_01/spatial_types_01.3.ast
index fe680d7..75af3db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/spatial_types_01/spatial_types_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/spatial_types_01/spatial_types_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Spatial]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/temp_types_01/temp_types_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/temp_types_01/temp_types_01.3.ast
index 8a8d9e4..3824150 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/temp_types_01/temp_types_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/scan/temp_types_01/temp_types_01.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Temp]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast
index 96d0aa7..0c83370 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/count-nullable/count-nullable.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [c]
Variable [ Name=$g ]
Variable [ Name=$age ]
@@ -27,7 +27,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/cust-filter/cust-filter.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/cust-filter/cust-filter.3.ast
index eea1c28..ec2e7ca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/cust-filter/cust-filter.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/cust-filter/cust-filter.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customers]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/has-param1/has-param1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/has-param1/has-param1.3.ast
index fb79748..f684fe5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/has-param1/has-param1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/semistructured/has-param1/has-param1.3.ast
@@ -4,14 +4,14 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
]
Where
- FunctionCall null.not@1[
- FunctionCall null.is-missing@1[
+ FunctionCall algebricks.not@1[
+ FunctionCall algebricks.is-missing@1[
FieldAccessor [
Variable [ Name=$o ]
Field=param1
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.3.ast
index 57dcfa5..f8fbe52 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-edit-distance/fuzzyeq-edit-distance.3.ast
@@ -5,7 +5,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast
index e85a7bf..0071a69 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/fuzzyeq-similarity-jaccard/fuzzyeq-similarity-jaccard.3.ast
@@ -5,7 +5,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast
index c22f17a..87d047a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-check_query/similarity-jaccard-check_query.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast
index 71ac309..33ac509 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted-check_query/similarity-jaccard-sorted-check_query.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast
index 5151c6c..aefc2c0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard-sorted_query/similarity-jaccard-sorted_query.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast
index 9a20266..eed6d38 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/similarity/similarity-jaccard_query/similarity-jaccard_query.3.ast
@@ -4,7 +4,7 @@
SELECT ELEMENT [
Variable [ Name=$paper ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [DBLP]
]
AS Variable [ Name=$paper ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast
index 956cabf..8346dad 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation-with-filtering/cell-aggregation-with-filtering.3.ast
@@ -14,7 +14,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TwitterData]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast
index 87ebfdb..2b26217 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/cell-aggregation/cell-aggregation.3.ast
@@ -17,7 +17,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
@@ -47,7 +47,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o]
Variable [ Name=$g ]
Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast
index 5040c1b..3a7956a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/circle-intersect-circle/circle-intersect-circle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/create-rtree-index/create-rtree-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/create-rtree-index/create-rtree-index.3.ast
index 58d5fdc..8372736 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/create-rtree-index/create-rtree-index.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/create-rtree-index/create-rtree-index.3.ast
@@ -6,7 +6,7 @@
Field=id
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast
index 3843218..c72329a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/distance-between-points/distance-between-points.3.ast
@@ -17,7 +17,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast
index d86e0a2..7e63c3f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-circle/line-intersect-circle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast
index 61a0bec..6a909e4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-line/line-intersect-line.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast
index c61ff06..d8382d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-polygon/line-intersect-polygon.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast
index 03641af..d0ae294 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/line-intersect-rectangle/line-intersect-rectangle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast
index 061b28e..8451168 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-equals-point/point-equals-point.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast
index 6dd5acf..2bdb8ff 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-circle/point-in-circle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast
index 1b1c871..c8cdf04 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-polygon/point-in-polygon.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
index 0ed156a..71e35f1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-in-rectangle/point-in-rectangle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
index d42bc6d..87bb48c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/point-on-line/point-on-line.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
index a5b2bce..ea6034c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-circle/polygon-intersect-circle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
index 7db7bd7..82bcd75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-polygon/polygon-intersect-polygon.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
index 823b733..2a9be04 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/polygon-intersect-rectangle/polygon-intersect-rectangle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
index b32c632..3df29b5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-circle/rectangle-intersect-circle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
index cb1d05b..956c584 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/spatial/rectangle-intersect-rectangle/rectangle-intersect-rectangle.3.ast
@@ -12,7 +12,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [MyData]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
index f3fe952..357a718 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/cpttostr01/cpttostr01.3.ast
@@ -8,7 +8,7 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
index 046dd8e..2325761 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/matches05/matches05.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds1]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
index 5109d04..ec01a3c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strconcat01/strconcat01.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
index 6e1db4d..4a68e52 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/strlen03/strlen03.3.ast
@@ -8,7 +8,7 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
index caa541f..4417da1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr05/substr05.3.ast
@@ -19,7 +19,7 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
index 6248340..11501a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/substr06/substr06.3.ast
@@ -9,7 +9,7 @@
LiteralExpr [LONG] [4]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testdst]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
index 885501d..80018ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/string/toLowerCase03/toLowerCase03.3.ast
@@ -8,7 +8,7 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ast
deleted file mode 100644
index 2192c6c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl LineItemType [
- closed RecordType {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : bigint,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
- }
-]
-DatasetDecl LineItem(LineItemType) partitioned by [[l_orderkey], [l_linenumber]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.4.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
deleted file mode 100644
index 89cac37..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset-with-index/delete-from-loaded-dataset-with-index.5.ast
+++ /dev/null
@@ -1,31 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$c ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [LineItem]
- ]
- AS Variable [ Name=$c ]
-]
-Where
- OperatorExpr [
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_suppkey
- ]
- <
- LiteralExpr [LONG] [150]
- ]
-Orderby
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_orderkey
- ]
- ASC
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_linenumber
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ast
deleted file mode 100644
index 2192c6c..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl LineItemType [
- closed RecordType {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : bigint,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
- }
-]
-DatasetDecl LineItem(LineItemType) partitioned by [[l_orderkey], [l_linenumber]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
deleted file mode 100644
index 38a6ea9..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/delete-from-loaded-dataset/delete-from-loaded-dataset.3.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$c ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [LineItem]
- ]
- AS Variable [ Name=$c ]
-]
-Orderby
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_orderkey
- ]
- ASC
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_linenumber
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ast
deleted file mode 100644
index 27e4cf5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl Name [
- open RecordType {
- first : string,
- last : string
- }
-]
-TypeDecl Person [
- open RecordType {
- name : Name
- }
-]
-TypeDecl TestType [
- open RecordType {
- id : integer,
- name : string,
- locn : point,
- zip : string,
- person : Person
- }
-]
-DatasetDecl t1(TestType) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.ast
deleted file mode 100644
index e69de29..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.2.ast
+++ /dev/null
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
deleted file mode 100644
index 3a1ea0a..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-empty-secondary-indexes/drop-empty-secondary-indexes.3.ast
+++ /dev/null
@@ -1,29 +0,0 @@
-Query:
-SELECT ELEMENT [
-Variable [ Name=$l ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [Metadata.Index]
- ]
- AS Variable [ Name=$l ]
-]
-Where
- OperatorExpr [
- OperatorExpr [
- FieldAccessor [
- Variable [ Name=$l ]
- Field=IsPrimary
- ]
- =
- LiteralExpr [FALSE]
- ]
- and
- OperatorExpr [
- FieldAccessor [
- Variable [ Name=$l ]
- Field=DataverseName
- ]
- =
- LiteralExpr [STRING] [test]
- ]
- ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.1.ast
deleted file mode 100644
index 13f1f01..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl Schema [
- closed RecordType {
- unique1 : bigint,
- unique2 : bigint,
- two : bigint,
- four : bigint,
- ten : bigint,
- twenty : bigint,
- onePercent : bigint,
- tenPercent : bigint,
- twentyPercent : bigint,
- fiftyPercent : bigint,
- unique3 : bigint,
- evenOnePercent : bigint,
- oddOnePercent : bigint,
- stringu1 : string,
- stringu2 : string,
- string4 : string
- }
-]
-DatasetDecl t1(Schema) partitioned by [[unique2]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.3.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast
deleted file mode 100644
index 6802467..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/drop-index/drop-index.4.ast
+++ /dev/null
@@ -1,30 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$a ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [t1]
- ]
- AS Variable [ Name=$a ]
-]
-Where
- OperatorExpr [
- OperatorExpr [
- FieldAccessor [
- Variable [ Name=$a ]
- Field=unique1
- ]
- >
- LiteralExpr [LONG] [10]
- ]
- and
- OperatorExpr [
- FieldAccessor [
- Variable [ Name=$a ]
- Field=stringu1
- ]
- =
- LiteralExpr [STRING] [DGAAAAXXXXXXXXXXXXXXXXXXX]
- ]
- ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ast
deleted file mode 100644
index 17dc8b5..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl LineItemType [
- closed RecordType {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : double,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
- }
-]
-DatasetDecl LineItem(LineItemType) partitioned by [[l_orderkey], [l_linenumber]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast
deleted file mode 100644
index d52d730..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/empty-load-with-index/empty-load-with-index.3.ast
+++ /dev/null
@@ -1,24 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$c ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [LineItem]
- ]
- AS Variable [ Name=$c ]
-]
-Orderby
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_orderkey
- ]
- ASC
- FieldAccessor [
- Variable [ Name=$c ]
- Field=l_linenumber
- ]
- ASC
-
-Limit
- LiteralExpr [LONG] [1]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ast
deleted file mode 100644
index d8ba369..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.1.ast
+++ /dev/null
@@ -1,10 +0,0 @@
-TypeDecl Emp [
- closed RecordType {
- id : bigint,
- fname : string,
- lname : string,
- age : bigint,
- dept : string
- }
-]
-DatasetDecl employee(Emp) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
deleted file mode 100644
index 4a6c0e4e5f..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset-with-index/insert-and-scan-dataset-with-index.3.ast
+++ /dev/null
@@ -1,17 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$l ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [test.employee]
- ]
- AS Variable [ Name=$l ]
-]
-Orderby
- FieldAccessor [
- Variable [ Name=$l ]
- Field=id
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ast
deleted file mode 100644
index d546e56..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.1.ast
+++ /dev/null
@@ -1,7 +0,0 @@
-DataverseUse test
-TypeDecl myDataType [
- open RecordType {
- id : bigint
- }
-]
-DatasetDecl myData(myDataType) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
deleted file mode 100644
index bb37414..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/insert-and-scan-dataset/insert-and-scan-dataset.3.ast
+++ /dev/null
@@ -1,17 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-Variable [ Name=$c ]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [myData]
- ]
- AS Variable [ Name=$c ]
-]
-Orderby
- FieldAccessor [
- Variable [ Name=$c ]
- Field=id
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ast
deleted file mode 100644
index c1ede5e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse tpch
-TypeDecl LineItemType [
- closed RecordType {
- l_orderkey : bigint,
- l_partkey : bigint,
- l_suppkey : bigint,
- l_linenumber : bigint,
- l_quantity : double,
- l_extendedprice : double,
- l_discount : double,
- l_tax : double,
- l_returnflag : string,
- l_linestatus : string,
- l_shipdate : string,
- l_commitdate : string,
- l_receiptdate : string,
- l_shipinstruct : string,
- l_shipmode : string,
- l_comment : string
- }
-]
-DatasetDecl LineItem(LineItemType) partitioned by [[l_orderkey], [l_linenumber]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.ast
deleted file mode 100644
index 0a5cca1..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse tpch
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
deleted file mode 100644
index 90ebf05..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
+++ /dev/null
@@ -1,249 +0,0 @@
-DataverseUse tpch
-Set import-private-functions=true
-Query:
-SELECT ELEMENT [
-RecordConstructor [
- (
- LiteralExpr [STRING] [l_returnflag]
- :
- Variable [ Name=$l_returnflag ]
- )
- (
- LiteralExpr [STRING] [l_linestatus]
- :
- Variable [ Name=$l_linestatus ]
- )
- (
- LiteralExpr [STRING] [sum_qty]
- :
- FunctionCall asterix.sql-sum@1[
- (
- SELECT ELEMENT [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#2 ]
- Field=l
- ]
- Field=l_quantity
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#2 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [sum_base_price]
- :
- FunctionCall asterix.sql-sum@1[
- (
- SELECT ELEMENT [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#3 ]
- Field=l
- ]
- Field=l_extendedprice
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#3 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [sum_disc_price]
- :
- FunctionCall asterix.sql-sum@1[
- (
- SELECT ELEMENT [
- OperatorExpr [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#4 ]
- Field=l
- ]
- Field=l_extendedprice
- ]
- *
- OperatorExpr [
- LiteralExpr [LONG] [1]
- -
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#4 ]
- Field=l
- ]
- Field=l_discount
- ]
- ]
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#4 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [sum_charge]
- :
- FunctionCall asterix.sql-sum@1[
- (
- SELECT ELEMENT [
- OperatorExpr [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#5 ]
- Field=l
- ]
- Field=l_extendedprice
- ]
- *
- OperatorExpr [
- LiteralExpr [LONG] [1]
- -
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#5 ]
- Field=l
- ]
- Field=l_discount
- ]
- ]
- *
- OperatorExpr [
- LiteralExpr [LONG] [1]
- +
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#5 ]
- Field=l
- ]
- Field=l_tax
- ]
- ]
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#5 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [ave_qty]
- :
- FunctionCall asterix.sql-avg@1[
- (
- SELECT ELEMENT [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#6 ]
- Field=l
- ]
- Field=l_quantity
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#6 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [ave_price]
- :
- FunctionCall asterix.sql-avg@1[
- (
- SELECT ELEMENT [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#7 ]
- Field=l
- ]
- Field=l_extendedprice
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#7 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [ave_disc]
- :
- FunctionCall asterix.sql-avg@1[
- (
- SELECT ELEMENT [
- FieldAccessor [
- FieldAccessor [
- Variable [ Name=#8 ]
- Field=l
- ]
- Field=l_discount
- ]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#8 ]
- ]
- )
- ]
- )
- (
- LiteralExpr [STRING] [count_order]
- :
- FunctionCall asterix.sql-count@1[
- (
- SELECT ELEMENT [
- LiteralExpr [LONG] [1]
- ]
- FROM [ Variable [ Name=#1 ]
- AS Variable [ Name=#9 ]
- ]
- )
- ]
- )
-]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [LineItem]
- ]
- AS Variable [ Name=$l ]
-]
-Where
- OperatorExpr [
- FieldAccessor [
- Variable [ Name=$l ]
- Field=l_shipdate
- ]
- <=
- LiteralExpr [STRING] [1998-09-02]
- ]
-Groupby
- Variable [ Name=$l_returnflag ]
- :=
- FieldAccessor [
- Variable [ Name=$l ]
- Field=l_returnflag
- ]
- Variable [ Name=$l_linestatus ]
- :=
- FieldAccessor [
- Variable [ Name=$l ]
- Field=l_linestatus
- ]
- GROUP AS Variable [ Name=#1 ]
- (
- l:=Variable [ Name=$l ]
- )
-
-Orderby
- Variable [ Name=$l_returnflag ]
- ASC
- Variable [ Name=$l_linestatus ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ast
deleted file mode 100644
index 9e01d19..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.1.ast
+++ /dev/null
@@ -1,15 +0,0 @@
-DataverseUse test
-TypeDecl MyRecord [
- closed RecordType {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
- }
-]
-DatasetDecl MyData(MyRecord) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.4.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
deleted file mode 100644
index f814183..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-delete-rtree-secondary-index/scan-delete-rtree-secondary-index.5.ast
+++ /dev/null
@@ -1,45 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-RecordConstructor [
- (
- LiteralExpr [STRING] [id]
- :
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- )
-]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [MyData]
- ]
- AS Variable [ Name=$o ]
-]
-Where
- FunctionCall test.spatial-intersect@2[
- FieldAccessor [
- Variable [ Name=$o ]
- Field=point
- ]
- FunctionCall test.create-polygon@1[
- OrderedListConstructor [
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [1.0]
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [1.0]
- ]
- ]
- ]
-Orderby
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ast
deleted file mode 100644
index 79e3a90..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl MyRecord [
- closed RecordType {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
- }
-]
-TypeDecl MyMiniRecord [
- closed RecordType {
- id : bigint,
- point : point
- }
-]
-DatasetDecl MyData(MyRecord) partitioned by [[id]]
-DatasetDecl MyMiniData(MyMiniRecord) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast
deleted file mode 100644
index bc7ec93..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.ast
+++ /dev/null
@@ -1,45 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-RecordConstructor [
- (
- LiteralExpr [STRING] [id]
- :
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- )
-]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [MyMiniData]
- ]
- AS Variable [ Name=$o ]
-]
-Where
- FunctionCall test.spatial-intersect@2[
- FieldAccessor [
- Variable [ Name=$o ]
- Field=point
- ]
- FunctionCall test.create-polygon@1[
- OrderedListConstructor [
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [1.0]
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [1.0]
- ]
- ]
- ]
-Orderby
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ast
deleted file mode 100644
index 79e3a90..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl MyRecord [
- closed RecordType {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
- }
-]
-TypeDecl MyMiniRecord [
- closed RecordType {
- id : bigint,
- point : point
- }
-]
-DatasetDecl MyData(MyRecord) partitioned by [[id]]
-DatasetDecl MyMiniData(MyMiniRecord) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.4.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
deleted file mode 100644
index bc7ec93..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-rtree-secondary-index/scan-insert-rtree-secondary-index.5.ast
+++ /dev/null
@@ -1,45 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-RecordConstructor [
- (
- LiteralExpr [STRING] [id]
- :
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- )
-]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [MyMiniData]
- ]
- AS Variable [ Name=$o ]
-]
-Where
- FunctionCall test.spatial-intersect@2[
- FieldAccessor [
- Variable [ Name=$o ]
- Field=point
- ]
- FunctionCall test.create-polygon@1[
- OrderedListConstructor [
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [1.0]
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [1.0]
- ]
- ]
- ]
-Orderby
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ast
deleted file mode 100644
index 79e3a90..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.1.ast
+++ /dev/null
@@ -1,22 +0,0 @@
-DataverseUse test
-TypeDecl MyRecord [
- closed RecordType {
- id : bigint,
- point : point,
- kwds : string,
- line1 : line,
- line2 : line,
- poly1 : polygon,
- poly2 : polygon,
- rec : rectangle,
- circle : circle
- }
-]
-TypeDecl MyMiniRecord [
- closed RecordType {
- id : bigint,
- point : point
- }
-]
-DatasetDecl MyData(MyRecord) partitioned by [[id]]
-DatasetDecl MyMiniData(MyMiniRecord) partitioned by [[id]]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.2.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.3.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.ast
deleted file mode 100644
index 916a59e..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.4.ast
+++ /dev/null
@@ -1 +0,0 @@
-DataverseUse test
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast
deleted file mode 100644
index bc7ec93..0000000
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temp-dataset/scan-insert-temp-to-persistent/scan-insert-temp-to-persistent.5.ast
+++ /dev/null
@@ -1,45 +0,0 @@
-DataverseUse test
-Query:
-SELECT ELEMENT [
-RecordConstructor [
- (
- LiteralExpr [STRING] [id]
- :
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- )
-]
-]
-FROM [ FunctionCall Metadata.dataset@1[
- LiteralExpr [STRING] [MyMiniData]
- ]
- AS Variable [ Name=$o ]
-]
-Where
- FunctionCall test.spatial-intersect@2[
- FieldAccessor [
- Variable [ Name=$o ]
- Field=point
- ]
- FunctionCall test.create-polygon@1[
- OrderedListConstructor [
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [1.0]
- LiteralExpr [DOUBLE] [0.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [4.0]
- LiteralExpr [DOUBLE] [12.0]
- LiteralExpr [DOUBLE] [1.0]
- ]
- ]
- ]
-Orderby
- FieldAccessor [
- Variable [ Name=$o ]
- Field=id
- ]
- ASC
-
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
index b86efca..f0b3ed4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds/insert_from_ext_ds.3.ast
@@ -60,7 +60,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [testds]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
index 8b4bda8..197a9a1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/insert_from_ext_ds_2/insert_from_ext_ds_2.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$r ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [timeData]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
index 3845b11..bcb8bbb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_0/interval_bin_gby_0.3.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tsdata]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
index 6e6e16d..35fe2a0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/interval_bin_gby_1/interval_bin_gby_1.3.ast
@@ -26,7 +26,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tsdata]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast
index 155bef0..44c2b3b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_0/overlap_bins_gby_0.3.ast
@@ -41,7 +41,7 @@
:
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [i]
Variable [ Name=$g ]
Variable [ Name=$bin ]
@@ -58,7 +58,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tsdata]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast
index 94cd539..6edcb68 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_1/overlap_bins_gby_1.3.ast
@@ -76,7 +76,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [tsdata]
]
AS Variable [ Name=$i1 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast
index af17428..6e6084a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/temporal/overlap_bins_gby_3/overlap_bins_gby_3.3.ast
@@ -37,7 +37,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [logs]
]
AS Variable [ Name=$i ]
@@ -102,7 +102,7 @@
Field=time
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [logs]
]
AS Variable [ Name=$i ]
@@ -130,7 +130,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [logs]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast
index 4f9e4ae..4cc9ee7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.10.ast
@@ -26,7 +26,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -57,7 +57,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.11.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.11.ast
index c246b60..61546aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.11.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.11.ast
@@ -44,7 +44,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
@@ -71,7 +71,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.12.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.12.ast
index 72f7150..d34dab2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.12.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.12.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$fbu ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
@@ -18,7 +18,7 @@
]
]
Satifies [
- FunctionCall null.is-missing@1[
+ FunctionCall algebricks.is-missing@1[
FieldAccessor [
Variable [ Name=$e ]
Field=end-date
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.13.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.13.ast
index 733dc37..519c3b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.13.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.13.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$fbu ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
@@ -18,8 +18,8 @@
]
]
Satifies [
- FunctionCall null.not@1[
- FunctionCall null.is-missing@1[
+ FunctionCall algebricks.not@1[
+ FunctionCall algebricks.is-missing@1[
FieldAccessor [
Variable [ Name=$e ]
Field=end-date
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.ast
index 08c931a..ed127c3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.14.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$fbu ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast
index 210e276..794eb1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.15.ast
@@ -23,7 +23,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast
index 210e276..794eb1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.16.ast
@@ -23,7 +23,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast
index f3e7d16..39c7177 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.17.ast
@@ -14,7 +14,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.18.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.18.ast
index f00ce81..8e19396 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.18.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.18.ast
@@ -19,7 +19,7 @@
Field=referred-topics
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -61,7 +61,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.20.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.20.ast
index dca454e..57db595 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.20.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.20.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.ast
index b12acb3..62277f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.22.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast
index de6b8d6..c147dbf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.23.ast
@@ -57,7 +57,7 @@
)
finer
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast
index 06fdeb4..6fa5835 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.24.ast
@@ -20,12 +20,12 @@
]
msg
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast
index 8985862..c5893b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.25.ast
@@ -11,7 +11,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
index ead363d..2228a45 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.26.ast
@@ -2,7 +2,7 @@
Query:
SELECT [
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [employment]
Variable [ Name=#1 ]
Variable [ Name=$organization-name ]
@@ -100,7 +100,7 @@
]
max
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
@@ -126,7 +126,7 @@
Orderby
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [employment]
Variable [ Name=#1 ]
Variable [ Name=$organization-name ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast
index dccec7c..c982ef7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.27.ast
@@ -91,7 +91,7 @@
]
max
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.4.ast
index d26d606..b495715 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.5.ast
index b31cba5..37856b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast
index 1d90356..08efade 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.6.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.7.ast
index b38e679..f30f2a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.7.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.8.ast
index b38e679..f30f2a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.8.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.9.ast
index 1d228cf..79a1f87 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite-open/tinysocial-suite.9.ast
@@ -20,7 +20,7 @@
Field=message
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
@@ -48,7 +48,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast
index 4f9e4ae..4cc9ee7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.10.ast
@@ -26,7 +26,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -57,7 +57,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.11.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.11.ast
index c246b60..61546aa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.11.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.11.ast
@@ -44,7 +44,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
@@ -71,7 +71,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.12.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.12.ast
index 72f7150..d34dab2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.12.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.12.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$fbu ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
@@ -18,7 +18,7 @@
]
]
Satifies [
- FunctionCall null.is-missing@1[
+ FunctionCall algebricks.is-missing@1[
FieldAccessor [
Variable [ Name=$e ]
Field=end-date
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.13.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.13.ast
index 733dc37..519c3b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.13.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.13.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$fbu ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
@@ -18,8 +18,8 @@
]
]
Satifies [
- FunctionCall null.not@1[
- FunctionCall null.is-missing@1[
+ FunctionCall algebricks.not@1[
+ FunctionCall algebricks.is-missing@1[
FieldAccessor [
Variable [ Name=$e ]
Field=end-date
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.ast
index 08c931a..ed127c3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.14.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$fbu ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$fbu ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast
index 210e276..794eb1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.15.ast
@@ -23,7 +23,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast
index 210e276..794eb1a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.16.ast
@@ -23,7 +23,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast
index f3e7d16..39c7177 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.17.ast
@@ -14,7 +14,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.18.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.18.ast
index f00ce81..8e19396 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.18.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.18.ast
@@ -19,7 +19,7 @@
Field=referred-topics
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t2 ]
@@ -61,7 +61,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.20.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.20.ast
index dca454e..57db595 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.20.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.20.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.ast
index b12acb3..62277f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.22.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$t ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast
index de6b8d6..c147dbf 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.23.ast
@@ -57,7 +57,7 @@
)
finer
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TweetMessages]
]
AS Variable [ Name=$t ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast
index 06fdeb4..6fa5835 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.24.ast
@@ -20,12 +20,12 @@
]
msg
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast
index 8985862..c5893b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.25.ast
@@ -11,7 +11,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.4.ast
index d26d606..b495715 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.4.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.5.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.5.ast
index b31cba5..37856b4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.5.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.5.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast
index 1d90356..08efade 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.6.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$user ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.7.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.7.ast
index b38e679..f30f2a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.7.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.7.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.8.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.8.ast
index b38e679..f30f2a4 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.8.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.8.ast
@@ -20,12 +20,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.9.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.9.ast
index 1d228cf..79a1f87 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.9.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tinysocial/tinysocial-suite/tinysocial-suite.9.ast
@@ -20,7 +20,7 @@
Field=message
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookMessages]
]
AS Variable [ Name=$message ]
@@ -48,7 +48,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [FacebookUsers]
]
AS Variable [ Name=$user ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
index 64b8438..531a2ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
@@ -199,7 +199,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linestatus ]
@@ -214,7 +214,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
index cc34520..7b69432 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
@@ -24,17 +24,17 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -145,7 +145,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$o_shippriority ]
Variable [ Name=$g ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.ast
index 5c8e26f..45544e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q04_order_priority/q04_order_priority.3.ast
@@ -55,7 +55,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
index 2672311..8a2f536 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
@@ -14,7 +14,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -64,7 +64,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -114,7 +114,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -148,7 +148,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -174,12 +174,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Region]
]
AS Variable [ Name=$r ]
@@ -326,7 +326,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o1]
Variable [ Name=$g ]
Variable [ Name=$n_name ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
index 4b18e9c..60ca4f3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
@@ -29,7 +29,7 @@
]
revenue
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast
index 940a665..b5729fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q07_volume_shipping/q07_volume_shipping.3.ast
@@ -226,12 +226,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -271,7 +271,7 @@
)
AS Variable [ Name=$lo ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -291,7 +291,7 @@
)
AS Variable [ Name=$loc ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast
index 7ce4dcf..77b9e72 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q08_national_market_share/q08_national_market_share.3.ast
@@ -147,7 +147,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -234,7 +234,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -260,7 +260,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -278,7 +278,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -296,12 +296,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Region]
]
AS Variable [ Name=$r1 ]
@@ -397,7 +397,7 @@
)
AS Variable [ Name=$lnrco ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -443,7 +443,7 @@
)
AS Variable [ Name=$slnrcop ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
index 544ee11..f755d75 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
@@ -57,7 +57,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -115,7 +115,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -181,7 +181,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -268,12 +268,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -293,7 +293,7 @@
)
AS Variable [ Name=$s1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast
index 1509e6a..81ed2d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item/q10_returned_item.3.ast
@@ -121,7 +121,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -195,17 +195,17 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -356,7 +356,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [locn]
Variable [ Name=$c_address ]
Variable [ Name=$g ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast
index 1509e6a..81ed2d2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q10_returned_item_int64/q10_returned_item_int64.3.ast
@@ -121,7 +121,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -195,17 +195,17 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -356,7 +356,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [locn]
Variable [ Name=$c_address ]
Variable [ Name=$g ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.ast
index 5ad8aae..27fc0e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q11_important_stock/q11_important_stock.3.ast
@@ -17,7 +17,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -35,12 +35,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -134,7 +134,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -152,12 +152,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.ast
index 98af71c..97cb94f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q12_shipping/q12_shipping.3.ast
@@ -105,12 +105,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast
index 9e21c8f..7f06804 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q13_customer_distribution/q13_customer_distribution.3.ast
@@ -36,7 +36,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [co]
Variable [ Name=$g2 ]
Variable [ Name=$c_custkey ]
@@ -75,7 +75,7 @@
Field=o_orderkey
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -108,7 +108,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast
index f5287e7..05e22d1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q14_promotion_effect/q14_promotion_effect.3.ast
@@ -39,7 +39,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lp]
Variable [ Name=$g ]
Variable [ Name=$l ]
@@ -77,7 +77,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lp]
Variable [ Name=$g ]
Variable [ Name=$l ]
@@ -95,12 +95,12 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
index 8a37ecc..a3cff24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q15_top_supplier/q15_top_supplier.3.ast
@@ -140,7 +140,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
index d4ea6a5..a6d19ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
@@ -341,7 +341,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t2]
Variable [ Name=$g ]
Variable [ Name=$p_brand ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
index f05d5e3..25bc7f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_large_gby_variant/q17_large_gby_variant.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -41,7 +41,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -70,7 +70,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -98,7 +98,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -126,7 +126,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -154,7 +154,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -182,7 +182,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -210,7 +210,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -238,7 +238,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -266,7 +266,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -294,7 +294,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -311,7 +311,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
index 185529b..def014d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q17_small_quantity_order_revenue/q17_small_quantity_order_revenue.3.ast
@@ -68,12 +68,12 @@
]
AS Variable [ Name=$t ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
index adb46b5..4446895 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q18_large_volume_customer/q18_large_volume_customer.3.ast
@@ -40,7 +40,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$o_orderdate ]
@@ -61,12 +61,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -92,7 +92,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$o ]
Variable [ Name=$l_orderkey ]
@@ -111,7 +111,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -131,7 +131,7 @@
)
AS Variable [ Name=$t ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
index 8afd86a..79ed138 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q19_discounted_revenue/q19_discounted_revenue.3.ast
@@ -21,12 +21,12 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
index aa7187e..9ef07b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
@@ -62,7 +62,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$l_suppkey ]
Variable [ Name=$g ]
@@ -81,7 +81,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -136,7 +136,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -154,7 +154,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -247,12 +247,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
index 01b9b14..62cbc19 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
@@ -324,7 +324,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -350,12 +350,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -375,7 +375,7 @@
)
AS Variable [ Name=$ns ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
index 45790cd..ffd3d1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
@@ -50,7 +50,7 @@
Field=c_acctbal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -79,7 +79,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [ct]
Variable [ Name=$g ]
Variable [ Name=$cntrycode ]
@@ -104,7 +104,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [ct]
Variable [ Name=$g ]
Variable [ Name=$cntrycode ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
index 3dde59d..f1705b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue601/query-issue601.3.ast
@@ -6,7 +6,7 @@
LiteralExpr [STRING] [l_linenumber]
:
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linenumber ]
@@ -37,7 +37,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -56,7 +56,7 @@
Orderby
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linenumber ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
index 177f281..c740bc5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue638/query-issue638.3.ast
@@ -57,7 +57,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -115,7 +115,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -181,7 +181,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -268,12 +268,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -293,7 +293,7 @@
)
AS Variable [ Name=$s1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
index 3681810..1a141d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785-2/query-issue785-2.3.ast
@@ -23,12 +23,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
@@ -71,12 +71,12 @@
FROM [ Variable [ Name=$t ]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
index 9d44d8f..1154826 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue785/query-issue785.3.ast
@@ -109,17 +109,17 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast
index 9302eb3..96ee1bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch-sql-like/query-issue786/query-issue786.3.ast
@@ -36,12 +36,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
@@ -113,12 +113,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/distinct_by/distinct_by.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/distinct_by/distinct_by.3.ast
index 59ff8c8..4b8cc1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/distinct_by/distinct_by.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/distinct_by/distinct_by.3.ast
@@ -28,7 +28,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/group_no_agg/group_no_agg.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/group_no_agg/group_no_agg.3.ast
index 40dfc87..752f9b3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/group_no_agg/group_no_agg.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/group_no_agg/group_no_agg.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$name ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Regions_group_no_agg]
]
AS Variable [ Name=$r ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast
index 4bc5156..a31ef0b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/nest_aggregate/nest_aggregate.3.ast
@@ -36,12 +36,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
@@ -113,12 +113,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
index 64b8438..531a2ef 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q01_pricing_summary_report_nt/q01_pricing_summary_report_nt.3.ast
@@ -199,7 +199,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linestatus ]
@@ -214,7 +214,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
index cc34520..7b69432 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q03_shipping_priority_nt/q03_shipping_priority_nt.3.ast
@@ -24,17 +24,17 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -145,7 +145,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$o_shippriority ]
Variable [ Name=$g ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
index 86148b2..4dbf516 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q04_order_priority/q04_order_priority.3.ast
@@ -58,7 +58,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
index 2672311..8a2f536 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q05_local_supplier_volume/q05_local_supplier_volume.3.ast
@@ -14,7 +14,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -64,7 +64,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -114,7 +114,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -148,7 +148,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -174,12 +174,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Region]
]
AS Variable [ Name=$r ]
@@ -326,7 +326,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o1]
Variable [ Name=$g ]
Variable [ Name=$n_name ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
index e5f7758..dfef841 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.3.ast
@@ -19,7 +19,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
index 8cad46d..3791a43 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q06_forecast_revenue_change/q06_forecast_revenue_change.4.ast
@@ -16,7 +16,7 @@
]
count
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
index 940a665..b5729fd 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q07_volume_shipping/q07_volume_shipping.3.ast
@@ -226,12 +226,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -271,7 +271,7 @@
)
AS Variable [ Name=$lo ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -291,7 +291,7 @@
)
AS Variable [ Name=$loc ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
index e3d1247..f53ad0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q08_national_market_share/q08_national_market_share.3.ast
@@ -38,7 +38,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$g ]
Variable [ Name=$year ]
@@ -63,7 +63,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t]
Variable [ Name=$g ]
Variable [ Name=$year ]
@@ -163,7 +163,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -250,7 +250,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -276,7 +276,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -294,7 +294,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -312,12 +312,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Region]
]
AS Variable [ Name=$r1 ]
@@ -413,7 +413,7 @@
)
AS Variable [ Name=$lnrco ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -459,7 +459,7 @@
)
AS Variable [ Name=$slnrcop ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n2 ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
index b2f198a..74227e8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q09_product_type_profit_nt/q09_product_type_profit_nt.3.ast
@@ -25,7 +25,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [profit]
Variable [ Name=$g ]
Variable [ Name=$nation ]
@@ -66,7 +66,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -124,7 +124,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -190,7 +190,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -277,12 +277,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -302,7 +302,7 @@
)
AS Variable [ Name=$s1 ]
INNER JOIN
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
index 2afc675..eba3b00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item/q10_returned_item.3.ast
@@ -121,7 +121,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -195,17 +195,17 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
index 2afc675..eba3b00 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q10_returned_item_int64/q10_returned_item_int64.3.ast
@@ -121,7 +121,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -195,17 +195,17 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
index 5ad8aae..27fc0e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q11_important_stock/q11_important_stock.3.ast
@@ -17,7 +17,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -35,12 +35,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -134,7 +134,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -152,12 +152,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
index 3a0bf9e..be59cf6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q12_shipping/q12_shipping.3.ast
@@ -45,7 +45,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o]
Variable [ Name=$g ]
Variable [ Name=$l_shipmode ]
@@ -95,7 +95,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [o]
Variable [ Name=$g ]
Variable [ Name=$l_shipmode ]
@@ -112,12 +112,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
index 9e21c8f..7f06804 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q13_customer_distribution/q13_customer_distribution.3.ast
@@ -36,7 +36,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [co]
Variable [ Name=$g2 ]
Variable [ Name=$c_custkey ]
@@ -75,7 +75,7 @@
Field=o_orderkey
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -108,7 +108,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
index f5287e7..05e22d1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q14_promotion_effect/q14_promotion_effect.3.ast
@@ -39,7 +39,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lp]
Variable [ Name=$g ]
Variable [ Name=$l ]
@@ -77,7 +77,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [lp]
Variable [ Name=$g ]
Variable [ Name=$l ]
@@ -95,12 +95,12 @@
]
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
index 8a37ecc..a3cff24 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q15_top_supplier/q15_top_supplier.3.ast
@@ -140,7 +140,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
index d4ea6a5..a6d19ba 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q16_parts_supplier_relationship/q16_parts_supplier_relationship.3.ast
@@ -341,7 +341,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [t2]
Variable [ Name=$g ]
Variable [ Name=$p_brand ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
index f05d5e3..25bc7f7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q17_large_gby_variant/q17_large_gby_variant.3.ast
@@ -13,7 +13,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -41,7 +41,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -70,7 +70,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -98,7 +98,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -126,7 +126,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -154,7 +154,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -182,7 +182,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -210,7 +210,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -238,7 +238,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -266,7 +266,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -294,7 +294,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_partkey ]
@@ -311,7 +311,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
index adb46b5..4446895 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q18_large_volume_customer/q18_large_volume_customer.3.ast
@@ -40,7 +40,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$o_orderdate ]
@@ -61,12 +61,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -92,7 +92,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$o ]
Variable [ Name=$l_orderkey ]
@@ -111,7 +111,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -131,7 +131,7 @@
)
AS Variable [ Name=$t ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
index 8afd86a..79ed138 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q19_discounted_revenue/q19_discounted_revenue.3.ast
@@ -21,12 +21,12 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
index aa7187e..9ef07b1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q20_potential_part_promotion/q20_potential_part_promotion.3.ast
@@ -62,7 +62,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$l_suppkey ]
Variable [ Name=$g ]
@@ -81,7 +81,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -136,7 +136,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -154,7 +154,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -247,12 +247,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
index 01b9b14..62cbc19 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q21_suppliers_who_kept_orders_waiting/q21_suppliers_who_kept_orders_waiting.3.ast
@@ -324,7 +324,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -350,12 +350,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
@@ -375,7 +375,7 @@
)
AS Variable [ Name=$ns ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
index 45790cd..ffd3d1c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/q22_global_sales_opportunity/q22_global_sales_opportunity.3.ast
@@ -50,7 +50,7 @@
Field=c_acctbal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -79,7 +79,7 @@
FunctionCall asterix.count@1[
(
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [ct]
Variable [ Name=$g ]
Variable [ Name=$cntrycode ]
@@ -104,7 +104,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [ct]
Variable [ Name=$g ]
Variable [ Name=$cntrycode ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
index 45c344d..bbca35e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue562/query-issue562.3.ast
@@ -97,7 +97,7 @@
Field=c_acctbal
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$c ]
@@ -206,7 +206,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [ct]
Variable [ Name=$g ]
Variable [ Name=$cntrycode ]
@@ -234,7 +234,7 @@
SELECT ELEMENT [
Variable [ Name=$o ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
index 3dde59d..f1705b8 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue601/query-issue601.3.ast
@@ -6,7 +6,7 @@
LiteralExpr [STRING] [l_linenumber]
:
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linenumber ]
@@ -37,7 +37,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -56,7 +56,7 @@
Orderby
FieldAccessor [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linenumber ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
index 177f281..c740bc5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue638/query-issue638.3.ast
@@ -57,7 +57,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$o ]
@@ -115,7 +115,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Part]
]
AS Variable [ Name=$p ]
@@ -181,7 +181,7 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Partsupp]
]
AS Variable [ Name=$ps ]
@@ -268,12 +268,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Supplier]
]
AS Variable [ Name=$s ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
@@ -293,7 +293,7 @@
)
AS Variable [ Name=$s1 ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
index 3681810..1a141d6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785-2/query-issue785-2.3.ast
@@ -23,12 +23,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
@@ -71,12 +71,12 @@
FROM [ Variable [ Name=$t ]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
index 9d44d8f..1154826 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue785/query-issue785.3.ast
@@ -109,17 +109,17 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$n ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
index 9302eb3..96ee1bb 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue786/query-issue786.3.ast
@@ -36,12 +36,12 @@
)
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Orders]
]
AS Variable [ Name=$orders ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Customer]
]
AS Variable [ Name=$customer ]
@@ -113,12 +113,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Nation]
]
AS Variable [ Name=$nation ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [SelectedNation]
]
AS Variable [ Name=$sn ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
index 4f8a868..d13281a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-2/query-issue810-2.3.ast
@@ -28,7 +28,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
index bc03eae..ffae08a 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810-3/query-issue810-3.3.ast
@@ -42,7 +42,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -85,7 +85,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$g ]
Variable [ Name=$l_linestatus ]
@@ -116,7 +116,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$expensives ]
Variable [ Name=$g ]
@@ -171,7 +171,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$expensives ]
Variable [ Name=$g ]
@@ -209,7 +209,7 @@
]
FROM [ (
SELECT ELEMENT [
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [l]
Variable [ Name=$expensives ]
Variable [ Name=$g ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
index 6a25433..a8b2d61 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue810/query-issue810.3.ast
@@ -28,7 +28,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
index 13647f7..e234584 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827-2/query-issue827-2.3.ast
@@ -12,7 +12,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -40,7 +40,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -70,7 +70,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -109,7 +109,7 @@
]
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -128,7 +128,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -156,7 +156,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -175,7 +175,7 @@
Field=l_discount
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$i ]
@@ -191,7 +191,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
index c970c9f..f5ffaca 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/tpch/query-issue827/query-issue827.3.ast
@@ -12,7 +12,7 @@
Field=l_quantity
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
@@ -35,7 +35,7 @@
Field=l_extendedprice
]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [LineItem]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
index 3bfb16d..3d2cbf0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/opentype_orderby_01/opentype_orderby_01.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
index 0213ef7..86ddc40 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_01/promotion_closedtype_field_vs_closedtype_field_01.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
index 64df8db..fc6ccd7 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_02/promotion_closedtype_field_vs_closedtype_field_02.3.ast
@@ -40,12 +40,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
index 94a96b3..e1e0b78 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_03/promotion_closedtype_field_vs_closedtype_field_03.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
index 7f64ba5..5bc6017 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_04/promotion_closedtype_field_vs_closedtype_field_04.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
index a2dace8..9cf343f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_closedtype_field_05/promotion_closedtype_field_vs_closedtype_field_05.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
index 9c92b73..5341518 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_01/promotion_closedtype_field_vs_constant_01.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
index dc2d65e..c79f8f0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_02/promotion_closedtype_field_vs_constant_02.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
index ce149e5..61b7783 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_03/promotion_closedtype_field_vs_constant_03.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
index bb6e108..7fbded9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_04/promotion_closedtype_field_vs_constant_04.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
index 9c09b76..723b645 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_05/promotion_closedtype_field_vs_constant_05.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
index bb6e108..7fbded9 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_06/promotion_closedtype_field_vs_constant_06.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
index f72fe79..5c2eaea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_07/promotion_closedtype_field_vs_constant_07.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
index 6d9aeb1..1c2da31 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_08/promotion_closedtype_field_vs_constant_08.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
index c9bb1db..fb316d3 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_09/promotion_closedtype_field_vs_constant_09.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
index ba64cdb..9a851e0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_10/promotion_closedtype_field_vs_constant_10.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
index 2b34755..8e9097e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_constant_11/promotion_closedtype_field_vs_constant_11.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
index ba51a7d..b8ef4a5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_01/promotion_closedtype_field_vs_opentype_field_01.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
index bd77024..d54b9ea 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_02/promotion_closedtype_field_vs_opentype_field_02.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
index b98cf75..0284f07 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_03/promotion_closedtype_field_vs_opentype_field_03.3.ast
@@ -36,12 +36,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
index c35de65..492bf5c 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_closedtype_field_vs_opentype_field_04/promotion_closedtype_field_vs_opentype_field_04.3.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
index d9b7e47..8f8c6e6 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_01/promotion_opentype_field_vs_constant_01.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
index 3a70fcd..603ee37 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_02/promotion_opentype_field_vs_constant_02.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
index 2a43942..c8d3336 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_03/promotion_opentype_field_vs_constant_03.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
index 280cc68..b189ed1 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_04/promotion_opentype_field_vs_constant_04.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
index b3157c6..46eec0e 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_05/promotion_opentype_field_vs_constant_05.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
index d75525e..35dac74 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_06/promotion_opentype_field_vs_constant_06.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
index 2fec640..e1f1e1f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_07/promotion_opentype_field_vs_constant_07.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
index eeeaaf0..5a7a8ce 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_constant_08/promotion_opentype_field_vs_constant_08.3.ast
@@ -20,7 +20,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
index 7e17d14..25868db 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_01/promotion_opentype_field_vs_opentype_field_01.3.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
index 5230c60..f000f53 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/promotion_opentype_field_vs_opentype_field_02/promotion_opentype_field_vs_opentype_field_02.3.ast
@@ -28,12 +28,12 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [empDataset]
]
AS Variable [ Name=$emp ]
,
- FunctionCall Metadata.dataset@1[
+ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [deptDataset]
]
AS Variable [ Name=$dept ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
index 60d0074..1ed42fa 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_0/type_promotion_0.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Int64Test]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
index 98f9e80..e2451f5 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/types/type_promotion_1/type_promotion_1.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$i ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [TestSet]
]
AS Variable [ Name=$i ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
index f1655e7..c2bbdf2 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue244/query-issue244.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [t2]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
index d5b9c31..96ef965 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.2.ast
@@ -5,7 +5,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
index d5b9c31..96ef965 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/query-issue489/query-issue489.4.ast
@@ -5,7 +5,7 @@
SELECT ELEMENT [
Variable [ Name=$x ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$x ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
index 4965a73..11f6429 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf09/udf09.3.ast
@@ -6,7 +6,7 @@
SELECT ELEMENT [
Variable [ Name=$a ]
]
- FROM [ FunctionCall Metadata.dataset@1[
+ FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [test.t1]
]
AS Variable [ Name=$a ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
index c95a811..5c55550 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf18/udf18.3.ast
@@ -1,6 +1,6 @@
DataverseUse test
Query:
-FunctionCall null.not@1[
+FunctionCall algebricks.not@1[
FunctionCall test.fn06@0[
]
]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
index 6280700..cf9ed5f 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf23/udf23.3.ast
@@ -3,7 +3,7 @@
SELECT ELEMENT [
Variable [ Name=$l ]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Dataset]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
index 17e46ec..a6b4c63 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf28/udf28.2.ast
@@ -43,7 +43,7 @@
)
]
]
-FROM [ FunctionCall Metadata.dataset@1[
+FROM [ FunctionCall asterix.dataset@1[
LiteralExpr [STRING] [Metadata.Function]
]
AS Variable [ Name=$l ]
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
index 5f9294c..646fafc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/results_parser_sqlpp/user-defined-functions/udf30/udf30.1.ast
@@ -5,7 +5,7 @@
Query:
Let Variable [ Name=$z ]
:=
- FunctionCall Metadata.resolve@-1[
+ FunctionCall asterix.resolve@-1[
LiteralExpr [STRING] [y]
]
SELECT ELEMENT [
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
index 47560f6..17b14dc 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite.xml
@@ -1941,6 +1941,12 @@
</compilation-unit>
</test-case>
<test-case FilePath="dml">
+ <compilation-unit name="load-with-autogenerated-no-field">
+ <output-dir compare="Text">load-with-autogenerated-no-field</output-dir>
+ <expected-error>ASX1014: Field "not_id" is not found [CompilationException]</expected-error>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="dml">
<compilation-unit name="load-with-index">
<output-dir compare="Text">load-with-index</output-dir>
</compilation-unit>
@@ -7422,76 +7428,4 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="temp-dataset">
- <test-case FilePath="temp-dataset">
- <compilation-unit name="delete-from-loaded-dataset">
- <output-dir compare="Text">delete-from-loaded-dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="delete-from-loaded-dataset-with-index">
- <output-dir compare="Text">delete-from-loaded-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="drop-empty-secondary-indexes">
- <output-dir compare="Text">drop-empty-secondary-indexes</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="drop-index">
- <output-dir compare="Text">drop-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="empty-load-with-index">
- <output-dir compare="Text">empty-load-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset">
- <output-dir compare="Text">insert-and-scan-dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="q01_pricing_summary_report_nt">
- <output-dir compare="Text">q01_pricing_summary_report_nt</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-delete-rtree-secondary-index">
- <output-dir compare="Text">scan-delete-rtree-secondary-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-rtree-secondary-index">
- <output-dir compare="Text">scan-insert-rtree-secondary-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-persistent-to-temp">
- <output-dir compare="Text">scan-insert-persistent-to-temp</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-temp-to-persistent">
- <output-dir compare="Text">scan-insert-temp-to-persistent</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset-with-index">
- <output-dir compare="Text">insert-and-scan-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset-with-correlated-index">
- <output-dir compare="Text">insert-and-scan-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="temp_primary_plus_ngram_flush">
- <output-dir compare="Text">temp_primary_plus_ngram_flush</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
</test-suite>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
index 0d7ef36..71f1e15 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp.xml
@@ -1887,6 +1887,12 @@
</compilation-unit>
</test-case>
<test-case FilePath="dml">
+ <compilation-unit name="load-with-autogenerated-no-field">
+ <output-dir compare="Text">load-with-autogenerated-no-field</output-dir>
+ <expected-error>org.apache.asterix.common.exceptions.AsterixException: ASX1014: Field "not_id" is not found</expected-error>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="dml">
<compilation-unit name="insert-return-records">
<output-dir compare="Text">insert-return-records</output-dir>
</compilation-unit>
@@ -2737,6 +2743,11 @@
</compilation-unit>
</test-case>
<test-case FilePath="fulltext">
+ <compilation-unit name="fulltext-09">
+ <output-dir compare="Text">fulltext-09</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="fulltext">
<compilation-unit name="fulltext-index-01">
<output-dir compare="Text">fulltext-index-01</output-dir>
</compilation-unit>
@@ -2746,6 +2757,11 @@
<output-dir compare="Text">fulltext-index-02</output-dir>
</compilation-unit>
</test-case>
+ <test-case FilePath="fulltext">
+ <compilation-unit name="fulltext-index-08">
+ <output-dir compare="Text">fulltext-index-08</output-dir>
+ </compilation-unit>
+ </test-case>
</test-group>
<test-group name="global-aggregate">
<test-case FilePath="global-aggregate">
@@ -3040,6 +3056,26 @@
</compilation-unit>
</test-case>
<test-case FilePath="index-selection">
+ <compilation-unit name="btree-sec-primary-index-01">
+ <output-dir compare="Text">btree-sec-primary-index-01</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="index-selection">
+ <compilation-unit name="btree-sec-primary-index-02">
+ <output-dir compare="Text">btree-sec-primary-index-02</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="index-selection">
+ <compilation-unit name="btree-sec-primary-index-03">
+ <output-dir compare="Text">btree-sec-primary-index-03</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="index-selection">
+ <compilation-unit name="btree-sec-primary-index-04">
+ <output-dir compare="Text">btree-sec-primary-index-04</output-dir>
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="index-selection">
<compilation-unit name="btree-index-composite-key-mixed-intervals">
<output-dir compare="Text">btree-index-composite-key-mixed-intervals</output-dir>
</compilation-unit>
@@ -8995,72 +9031,7 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="temp-dataset">
- <test-case FilePath="temp-dataset">
- <compilation-unit name="delete-from-loaded-dataset">
- <output-dir compare="Text">delete-from-loaded-dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="delete-from-loaded-dataset-with-index">
- <output-dir compare="Text">delete-from-loaded-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="drop-empty-secondary-indexes">
- <output-dir compare="Text">drop-empty-secondary-indexes</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="drop-index">
- <output-dir compare="Text">drop-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="empty-load-with-index">
- <output-dir compare="Text">empty-load-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset">
- <output-dir compare="Text">insert-and-scan-dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="q01_pricing_summary_report_nt">
- <output-dir compare="Text">q01_pricing_summary_report_nt</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-delete-rtree-secondary-index">
- <output-dir compare="Text">scan-delete-rtree-secondary-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-rtree-secondary-index">
- <output-dir compare="Text">scan-insert-rtree-secondary-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-persistent-to-temp">
- <output-dir compare="Text">scan-insert-persistent-to-temp</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-temp-to-persistent">
- <output-dir compare="Text">scan-insert-temp-to-persistent</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset-with-index">
- <output-dir compare="Text">insert-and-scan-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset-with-correlated-index">
- <output-dir compare="Text">insert-and-scan-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
+ <test-group name="unnest">
<test-case FilePath="unnest">
<compilation-unit name="left-outer-unnest">
<output-dir compare="Text">left-outer-unnest</output-dir>
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
index fcd1a70..af30871 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_sqlpp_parser.xml
@@ -6746,66 +6746,4 @@
</compilation-unit>
</test-case>
</test-group>
- <test-group name="temp-dataset">
- <test-case FilePath="temp-dataset">
- <compilation-unit name="delete-from-loaded-dataset">
- <output-dir compare="AST">delete-from-loaded-dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="delete-from-loaded-dataset-with-index">
- <output-dir compare="AST">delete-from-loaded-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="drop-empty-secondary-indexes">
- <output-dir compare="AST">drop-empty-secondary-indexes</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="drop-index">
- <output-dir compare="AST">drop-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="empty-load-with-index">
- <output-dir compare="AST">empty-load-with-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset">
- <output-dir compare="AST">insert-and-scan-dataset</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="q01_pricing_summary_report_nt">
- <output-dir compare="AST">q01_pricing_summary_report_nt</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-delete-rtree-secondary-index">
- <output-dir compare="AST">scan-delete-rtree-secondary-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-rtree-secondary-index">
- <output-dir compare="AST">scan-insert-rtree-secondary-index</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-persistent-to-temp">
- <output-dir compare="AST">scan-insert-persistent-to-temp</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="scan-insert-temp-to-persistent">
- <output-dir compare="AST">scan-insert-temp-to-persistent</output-dir>
- </compilation-unit>
- </test-case>
- <test-case FilePath="temp-dataset">
- <compilation-unit name="insert-and-scan-dataset-with-index">
- <output-dir compare="AST">insert-and-scan-dataset-with-index</output-dir>
- </compilation-unit>
- </test-case>
- </test-group>
</test-suite>
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java
index a32d4dc..41c5ade 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IDatasetLifecycleManager.java
@@ -25,6 +25,7 @@
import org.apache.asterix.common.context.PrimaryIndexOperationTracker;
import org.apache.asterix.common.replication.IReplicationStrategy;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.IResourceLifecycleManager;
@@ -79,6 +80,14 @@
PrimaryIndexOperationTracker getOperationTracker(int datasetId);
/**
+ * creates (if necessary) and returns the component Id generator of a dataset.
+ *
+ * @param datasetId
+ * @return
+ */
+ ILSMComponentIdGenerator getComponentIdGenerator(int datasetId);
+
+ /**
* creates (if necessary) and returns the dataset virtual buffer caches.
*
* @param datasetId
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IJobEventListenerFactory.java
similarity index 68%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
copy to asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IJobEventListenerFactory.java
index 7a17743..0f37b13 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IJobEventListenerFactory.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
+package org.apache.asterix.common.api;
+
+import org.apache.asterix.common.transactions.TxnId;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
+
+/**
+ * an interface for JobEventListenerFactories to add Asterix transaction JobId getter
*/
+public interface IJobEventListenerFactory extends IJobletEventListenerFactory {
-use dataverse test;
-
-for $a in dataset('t1')
-where $a.unique1 > 10 and $a.stringu1="DGAAAAXXXXXXXXXXXXXXXXXXX"
-return $a
+ TxnId getTxnId(TxnId compiledTxnId);
+}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IMetadataLockManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IMetadataLockManager.java
index 4408d84..bed9869 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IMetadataLockManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/IMetadataLockManager.java
@@ -18,7 +18,6 @@
*/
package org.apache.asterix.common.api;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.metadata.LockList;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -31,10 +30,10 @@
* the lock list to add the new lock to
* @param dataverseName
* the dataverse name
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDataverseReadLock(LockList locks, String dataverseName) throws AsterixException;
+ void acquireDataverseReadLock(LockList locks, String dataverseName) throws AlgebricksException;
/**
* Acquire write lock on the dataverse
@@ -43,10 +42,10 @@
* the lock list to add the new lock to
* @param dataverseName
* the dataverse name
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDataverseWriteLock(LockList locks, String dataverseName) throws AsterixException;
+ void acquireDataverseWriteLock(LockList locks, String dataverseName) throws AlgebricksException;
/**
* Acquire read lock on the dataset (for queries)
@@ -55,10 +54,10 @@
* the lock list to add the new lock to
* @param datasetFullyQualifiedName
* the fully qualified name of the dataset
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDatasetReadLock(LockList locks, String datasetFullyQualifiedName) throws AsterixException;
+ void acquireDatasetReadLock(LockList locks, String datasetFullyQualifiedName) throws AlgebricksException;
/**
* Acquire write lock on the dataset (for dataset create, dataset drop, and index drop)
@@ -67,10 +66,10 @@
* the lock list to add the new lock to
* @param datasetFullyQualifiedName
* the fully qualified name of the dataset
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDatasetWriteLock(LockList locks, String datasetFullyQualifiedName) throws AsterixException;
+ void acquireDatasetWriteLock(LockList locks, String datasetFullyQualifiedName) throws AlgebricksException;
/**
* Acquire modify lock on the dataset (for inserts, upserts, deletes) Mutually exclusive with create index lock
@@ -79,10 +78,10 @@
* the lock list to add the new lock to
* @param datasetFullyQualifiedName
* the fully qualified name of the dataset
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDatasetModifyLock(LockList locks, String datasetFullyQualifiedName) throws AsterixException;
+ void acquireDatasetModifyLock(LockList locks, String datasetFullyQualifiedName) throws AlgebricksException;
/**
* Acquire create index lock on the dataset (for index creation) Mutually exclusive with modify lock
@@ -91,10 +90,10 @@
* the lock list to add the new lock to
* @param datasetFullyQualifiedName
* the fully qualified name of the dataset
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDatasetCreateIndexLock(LockList locks, String datasetFullyQualifiedName) throws AsterixException;
+ void acquireDatasetCreateIndexLock(LockList locks, String datasetFullyQualifiedName) throws AlgebricksException;
/**
* Acquire exclusive modify lock on the dataset. only a single thread can acquire this lock and it is mutually
@@ -104,11 +103,11 @@
* the lock list to add the new lock to
* @param datasetFullyQualifiedName
* the fully qualified name of the dataset
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
void acquireDatasetExclusiveModificationLock(LockList locks, String datasetFullyQualifiedName)
- throws AsterixException;
+ throws AlgebricksException;
/**
* Acquire read lock on the function
@@ -117,10 +116,10 @@
* the lock list to add the new lock to
* @param functionFullyQualifiedName
* the fully qualified name of the function
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireFunctionReadLock(LockList locks, String functionFullyQualifiedName) throws AsterixException;
+ void acquireFunctionReadLock(LockList locks, String functionFullyQualifiedName) throws AlgebricksException;
/**
* Acquire write lock on the function
@@ -129,10 +128,10 @@
* the lock list to add the new lock to
* @param functionFullyQualifiedName
* the fully qualified name of the function
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireFunctionWriteLock(LockList locks, String functionFullyQualifiedName) throws AsterixException;
+ void acquireFunctionWriteLock(LockList locks, String functionFullyQualifiedName) throws AlgebricksException;
/**
* Acquire read lock on the node group
@@ -141,10 +140,10 @@
* the lock list to add the new lock to
* @param nodeGroupName
* the name of the node group
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireNodeGroupReadLock(LockList locks, String nodeGroupName) throws AsterixException;
+ void acquireNodeGroupReadLock(LockList locks, String nodeGroupName) throws AlgebricksException;
/**
* Acquire write lock on the node group
@@ -153,10 +152,10 @@
* the lock list to add the new lock to
* @param nodeGroupName
* the name of the node group
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireNodeGroupWriteLock(LockList locks, String nodeGroupName) throws AsterixException;
+ void acquireNodeGroupWriteLock(LockList locks, String nodeGroupName) throws AlgebricksException;
/**
* Acquire read lock on the active entity
@@ -165,10 +164,10 @@
* the lock list to add the new lock to
* @param entityFullyQualifiedName
* the fully qualified name of the active entity
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireActiveEntityReadLock(LockList locks, String entityFullyQualifiedName) throws AsterixException;
+ void acquireActiveEntityReadLock(LockList locks, String entityFullyQualifiedName) throws AlgebricksException;
/**
* Acquire write lock on the active entity
@@ -177,10 +176,10 @@
* the lock list to add the new lock to
* @param entityFullyQualifiedName
* the fully qualified name of the active entity
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireActiveEntityWriteLock(LockList locks, String entityFullyQualifiedName) throws AsterixException;
+ void acquireActiveEntityWriteLock(LockList locks, String entityFullyQualifiedName) throws AlgebricksException;
/**
* Acquire read lock on the feed policy
@@ -189,10 +188,10 @@
* the lock list to add the new lock to
* @param feedPolicyFullyQualifiedName
* the fully qualified name of the feed policy
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireFeedPolicyWriteLock(LockList locks, String feedPolicyFullyQualifiedName) throws AsterixException;
+ void acquireFeedPolicyWriteLock(LockList locks, String feedPolicyFullyQualifiedName) throws AlgebricksException;
/**
* Acquire write lock on the feed policy
@@ -201,10 +200,10 @@
* the lock list to add the new lock to
* @param feedPolicyFullyQualifiedName
* the fully qualified name of the feed policy
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireFeedPolicyReadLock(LockList locks, String feedPolicyFullyQualifiedName) throws AsterixException;
+ void acquireFeedPolicyReadLock(LockList locks, String feedPolicyFullyQualifiedName) throws AlgebricksException;
/**
* Acquire read lock on the merge policy
@@ -213,10 +212,10 @@
* the lock list to add the new lock to
* @param mergePolicyFullyQualifiedName
* the fully qualified name of the merge policy
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireMergePolicyReadLock(LockList locks, String mergePolicyFullyQualifiedName) throws AsterixException;
+ void acquireMergePolicyReadLock(LockList locks, String mergePolicyFullyQualifiedName) throws AlgebricksException;
/**
* Acquire write lock on the merge policy
@@ -225,10 +224,10 @@
* the lock list to add the new lock to
* @param mergePolicyFullyQualifiedName
* the fully qualified name of the merge policy
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireMergePolicyWriteLock(LockList locks, String mergePolicyFullyQualifiedName) throws AsterixException;
+ void acquireMergePolicyWriteLock(LockList locks, String mergePolicyFullyQualifiedName) throws AlgebricksException;
/**
* Acquire read lock on the data type
@@ -237,10 +236,10 @@
* the lock list to add the new lock to
* @param datatypeFullyQualifiedName
* the fully qualified name of the data type
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDataTypeReadLock(LockList locks, String datatypeFullyQualifiedName) throws AsterixException;
+ void acquireDataTypeReadLock(LockList locks, String datatypeFullyQualifiedName) throws AlgebricksException;
/**
* Acquire write lock on the data type
@@ -249,10 +248,10 @@
* the lock list to add the new lock to
* @param datatypeFullyQualifiedName
* the fully qualified name of the data type
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
- void acquireDataTypeWriteLock(LockList locks, String datatypeFullyQualifiedName) throws AsterixException;
+ void acquireDataTypeWriteLock(LockList locks, String datatypeFullyQualifiedName) throws AlgebricksException;
/**
* Acquire read lock on the extension entity
@@ -263,11 +262,11 @@
* the extension key
* @param extensionEntityFullyQualifiedName
* the fully qualified name of the extension entity
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
void acquireExtensionReadLock(LockList locks, String extension, String extensionEntityFullyQualifiedName)
- throws AsterixException;
+ throws AlgebricksException;
/**
* Acquire write lock on the extension entity
@@ -278,11 +277,11 @@
* the extension key
* @param extensionEntityFullyQualifiedName
* the fully qualified name of the extension entity
- * @throws AsterixException
+ * @throws AlgebricksException
* if lock couldn't be acquired
*/
void acquireExtensionWriteLock(LockList locks, String extension, String extensionEntityFullyQualifiedName)
- throws AsterixException;
+ throws AlgebricksException;
/**
* Upgrade a previously acquired exclusive modification lock on the dataset to a write lock
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
index 548907c..8afa66d 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/api/INcApplicationContext.java
@@ -24,12 +24,12 @@
import org.apache.asterix.common.context.IStorageComponentProvider;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.replication.IRemoteRecoveryManager;
import org.apache.asterix.common.replication.IReplicaResourcesManager;
import org.apache.asterix.common.replication.IReplicationChannel;
import org.apache.asterix.common.replication.IReplicationManager;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.io.IIOManager;
@@ -68,7 +68,7 @@
ILSMOperationTracker getLSMBTreeOperationTracker(int datasetID);
- void initialize(boolean initialRun) throws IOException, ACIDException, AsterixException;
+ void initialize(boolean initialRun) throws IOException, ACIDException, AlgebricksException;
void setShuttingdown(boolean b);
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
index 3948ea6..7616aed 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/cluster/IClusterStateManager.java
@@ -27,6 +27,7 @@
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.event.schema.cluster.Node;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.config.IOption;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
@@ -115,7 +116,7 @@
* @param nodePartitions
* @throws AsterixException
*/
- void registerNodePartitions(String nodeId, ClusterPartition[] nodePartitions) throws AsterixException;
+ void registerNodePartitions(String nodeId, ClusterPartition[] nodePartitions) throws AlgebricksException;
/**
* De-register the specified node's partitions from this cluster state manager
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
index e74600e..9f57981 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/BaseOperationTracker.java
@@ -20,12 +20,11 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
-public class BaseOperationTracker implements ILSMOperationTracker {
+public class BaseOperationTracker implements ITransactionOperationTracker {
protected final int datasetID;
protected final DatasetInfo dsInfo;
@@ -62,4 +61,20 @@
public void exclusiveJobCommitted() throws HyracksDataException {
}
+
+ @Override
+ public void beforeTransaction(long resourceId) {
+ /*
+ * Increment dataset and index ref count to prevent them
+ * from being evicted/dropped until the transaction completes
+ */
+ dsInfo.touch();
+ dsInfo.getIndexes().get(resourceId).touch();
+ }
+
+ @Override
+ public void afterTransaction(long resourceId) {
+ dsInfo.untouch();
+ dsInfo.getIndexes().get(resourceId).untouch();
+ }
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/CorrelatedPrefixMergePolicy.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/CorrelatedPrefixMergePolicy.java
index a20e660..e5fc998 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/CorrelatedPrefixMergePolicy.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/CorrelatedPrefixMergePolicy.java
@@ -28,12 +28,15 @@
import org.apache.asterix.common.api.IDatasetLifecycleManager;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId.IdCompareResult;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.impls.PrefixMergePolicy;
+import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
public class CorrelatedPrefixMergePolicy extends PrefixMergePolicy {
@@ -86,27 +89,26 @@
//nothing to merge
return false;
}
- long minID = immutableComponents.get(mergeableIndexes.getLeft()).getComponentId().getMinId();
- long maxID = immutableComponents.get(mergeableIndexes.getRight()).getComponentId().getMaxId();
-
+ ILSMComponent leftComponent = immutableComponents.get(mergeableIndexes.getLeft());
+ ILSMComponent rightComponent = immutableComponents.get(mergeableIndexes.getRight());
+ ILSMComponentId targetId = LSMComponentIdUtils.union(leftComponent.getId(), rightComponent.getId());
Set<IndexInfo> indexInfos = datasetLifecycleManager.getDatasetInfo(datasetId).getDatsetIndexInfos();
int partition = getIndexPartition(index, indexInfos);
- triggerScheduledMerge(minID, maxID,
+ triggerScheduledMerge(targetId,
indexInfos.stream().filter(info -> info.getPartition() == partition).collect(Collectors.toSet()));
return true;
}
/**
- * Submit merge requests for all disk components within [minID, maxID]
+ * Submit merge requests for all disk components within the range specified by targetId
* of all indexes of a given dataset in the given partition
*
- * @param minID
- * @param maxID
- * @param partition
+ * @param targetId
* @param indexInfos
* @throws HyracksDataException
*/
- private void triggerScheduledMerge(long minID, long maxID, Set<IndexInfo> indexInfos) throws HyracksDataException {
+ private void triggerScheduledMerge(ILSMComponentId targetId, Set<IndexInfo> indexInfos)
+ throws HyracksDataException {
for (IndexInfo info : indexInfos) {
ILSMIndex lsmIndex = info.getIndex();
@@ -116,18 +118,17 @@
}
List<ILSMDiskComponent> mergableComponents = new ArrayList<>();
for (ILSMDiskComponent component : immutableComponents) {
- ILSMDiskComponentId id = component.getComponentId();
- if (id.getMinId() >= minID && id.getMaxId() <= maxID) {
+ ILSMComponentId id = component.getId();
+ IdCompareResult cmp = targetId.compareTo(id);
+ if (cmp == IdCompareResult.INCLUDE) {
mergableComponents.add(component);
- }
- if (id.getMaxId() < minID) {
+ } else if (cmp == IdCompareResult.GREATER_THAN) {
//disk components are ordered from latest (with largest IDs) to oldest (with smallest IDs)
- //if the component.maxID < minID, we can safely skip the rest disk components in the list
+ // if targetId>component.Id, we can safely skip the rest disk components in the list
break;
}
}
- ILSMIndexAccessor accessor =
- lsmIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = lsmIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleMerge(lsmIndex.getIOOperationCallback(), mergableComponents);
}
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLSMComponentIdGeneratorFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLSMComponentIdGeneratorFactory.java
new file mode 100644
index 0000000..7b8397c
--- /dev/null
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLSMComponentIdGeneratorFactory.java
@@ -0,0 +1,50 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.common.context;
+
+import org.apache.asterix.common.api.IDatasetLifecycleManager;
+import org.apache.asterix.common.api.INcApplicationContext;
+import org.apache.hyracks.api.application.INCServiceContext;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
+
+/**
+ * This factory implementation is used by AsterixDB layer so that indexes of a dataset (/partition)
+ * use the same Id generator. This guarantees their memory components would receive the same Id upon
+ * activation.
+ *
+ */
+public class DatasetLSMComponentIdGeneratorFactory implements ILSMComponentIdGeneratorFactory {
+ private static final long serialVersionUID = 1L;
+
+ private final int datasetId;
+
+ public DatasetLSMComponentIdGeneratorFactory(int datasetId) {
+ this.datasetId = datasetId;
+ }
+
+ @Override
+ public ILSMComponentIdGenerator getComponentIdGenerator(INCServiceContext serviceCtx) {
+ IDatasetLifecycleManager dslcManager =
+ ((INcApplicationContext) serviceCtx.getApplicationContext()).getDatasetLifecycleManager();
+ return dslcManager.getComponentIdGenerator(datasetId);
+ }
+
+}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java
index c4cd791..fe64d3b 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetLifecycleManager.java
@@ -42,12 +42,13 @@
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.lifecycle.ILifeCycleComponent;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
-import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentIdGenerator;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.ILocalResourceRepository;
import org.apache.hyracks.storage.common.LocalResource;
@@ -216,8 +217,7 @@
private static void flushAndWaitForIO(DatasetInfo dsInfo, IndexInfo iInfo) throws HyracksDataException {
if (iInfo.isOpen()) {
- ILSMIndexAccessor accessor =
- iInfo.getIndex().createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = iInfo.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleFlush(iInfo.getIndex().getIOOperationCallback());
}
@@ -234,10 +234,12 @@
dsr = datasets.get(did);
if (dsr == null) {
DatasetInfo dsInfo = new DatasetInfo(did);
- PrimaryIndexOperationTracker opTracker = new PrimaryIndexOperationTracker(did, logManager, dsInfo);
+ ILSMComponentIdGenerator idGenerator = new LSMComponentIdGenerator();
+ PrimaryIndexOperationTracker opTracker =
+ new PrimaryIndexOperationTracker(did, logManager, dsInfo, idGenerator);
DatasetVirtualBufferCaches vbcs = new DatasetVirtualBufferCaches(did, storageProperties,
memoryManager.getNumPages(did), numPartitions);
- dsr = new DatasetResource(dsInfo, opTracker, vbcs);
+ dsr = new DatasetResource(dsInfo, opTracker, vbcs, idGenerator);
datasets.put(did, dsr);
}
return dsr;
@@ -320,6 +322,11 @@
return datasets.get(datasetId).getOpTracker();
}
+ @Override
+ public ILSMComponentIdGenerator getComponentIdGenerator(int datasetId) {
+ return datasets.get(datasetId).getIdGenerator();
+ }
+
private void validateDatasetLifecycleManagerState() throws HyracksDataException {
if (stopped) {
throw new HyracksDataException(DatasetLifecycleManager.class.getSimpleName() + " was stopped.");
@@ -355,7 +362,7 @@
for (IndexInfo iInfo : dsr.getIndexes().values()) {
AbstractLSMIOOperationCallback ioCallback =
(AbstractLSMIOOperationCallback) iInfo.getIndex().getIOOperationCallback();
- if (!(((AbstractLSMIndex) iInfo.getIndex()).isCurrentMutableComponentEmpty()
+ if (!(iInfo.getIndex().isCurrentMutableComponentEmpty()
|| ioCallback.hasPendingFlush() || opTracker.isFlushLogCreated()
|| opTracker.isFlushOnExit())) {
long firstLSN = ioCallback.getFirstLSN();
@@ -405,10 +412,12 @@
}
}
+ ILSMComponentIdGenerator idGenerator = getComponentIdGenerator(dsInfo.getDatasetID());
+ idGenerator.refresh();
+
if (asyncFlush) {
for (IndexInfo iInfo : dsInfo.getIndexes().values()) {
- ILSMIndexAccessor accessor =
- iInfo.getIndex().createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = iInfo.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleFlush(iInfo.getIndex().getIOOperationCallback());
}
} else {
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetResource.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetResource.java
index 79ae1da..f6e2b0d 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetResource.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/DatasetResource.java
@@ -23,6 +23,7 @@
import org.apache.asterix.common.dataflow.DatasetLocalResource;
import org.apache.asterix.common.metadata.MetadataIndexImmutableProperties;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.common.LocalResource;
@@ -42,12 +43,15 @@
private final DatasetInfo datasetInfo;
private final PrimaryIndexOperationTracker datasetPrimaryOpTracker;
private final DatasetVirtualBufferCaches datasetVirtualBufferCaches;
+ private final ILSMComponentIdGenerator datasetComponentIdGenerator;
public DatasetResource(DatasetInfo datasetInfo, PrimaryIndexOperationTracker datasetPrimaryOpTracker,
- DatasetVirtualBufferCaches datasetVirtualBufferCaches) {
+ DatasetVirtualBufferCaches datasetVirtualBufferCaches,
+ ILSMComponentIdGenerator datasetComponentIdGenerator) {
this.datasetInfo = datasetInfo;
this.datasetPrimaryOpTracker = datasetPrimaryOpTracker;
this.datasetVirtualBufferCaches = datasetVirtualBufferCaches;
+ this.datasetComponentIdGenerator = datasetComponentIdGenerator;
}
public boolean isRegistered() {
@@ -116,6 +120,10 @@
return datasetPrimaryOpTracker;
}
+ public ILSMComponentIdGenerator getIdGenerator() {
+ return datasetComponentIdGenerator;
+ }
+
@Override
public int compareTo(DatasetResource o) {
return datasetInfo.compareTo(o.datasetInfo);
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/ITransactionOperationTracker.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/ITransactionOperationTracker.java
new file mode 100644
index 0000000..301801b
--- /dev/null
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/ITransactionOperationTracker.java
@@ -0,0 +1,42 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.common.context;
+
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
+
+public interface ITransactionOperationTracker extends ILSMOperationTracker {
+
+ /**
+ * Called before a transaction performs any operations on
+ * {@link org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex}
+ * with resource id {@code resourceId}
+ *
+ * @param resourceId
+ */
+ void beforeTransaction(long resourceId);
+
+ /**
+ * Called after a transaction completes its operations on
+ * {@link org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex}
+ * with resource id {@code resourceId}
+ *
+ * @param resourceId
+ */
+ void afterTransaction(long resourceId);
+}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
index 0899c21..ababe9c 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/context/PrimaryIndexOperationTracker.java
@@ -29,8 +29,10 @@
import org.apache.asterix.common.transactions.LogRecord;
import org.apache.asterix.common.utils.TransactionUtil;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.ComponentState;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
@@ -44,13 +46,16 @@
// Number of active operations on an ILSMIndex instance.
private final AtomicInteger numActiveOperations;
private final ILogManager logManager;
+ private final ILSMComponentIdGenerator idGenerator;
private boolean flushOnExit = false;
private boolean flushLogCreated = false;
- public PrimaryIndexOperationTracker(int datasetID, ILogManager logManager, DatasetInfo dsInfo) {
+ public PrimaryIndexOperationTracker(int datasetID, ILogManager logManager, DatasetInfo dsInfo,
+ ILSMComponentIdGenerator idGenerator) {
super(datasetID, dsInfo);
this.logManager = logManager;
this.numActiveOperations = new AtomicInteger();
+ this.idGenerator = idGenerator;
}
@Override
@@ -141,10 +146,10 @@
//This method is called sequentially by LogPage.notifyFlushTerminator in the sequence flushes were scheduled.
public synchronized void triggerScheduleFlush(LogRecord logRecord) throws HyracksDataException {
+ idGenerator.refresh();
for (ILSMIndex lsmIndex : dsInfo.getDatasetIndexes()) {
//get resource
- ILSMIndexAccessor accessor =
- lsmIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = lsmIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
//update resource lsn
AbstractLSMIOOperationCallback ioOpCallback =
(AbstractLSMIOOperationCallback) lsmIndex.getIOOperationCallback();
@@ -169,7 +174,7 @@
//modificationCallback can be NoOpOperationCallback when redo/undo operations are executed.
if (modificationCallback != NoOpOperationCallback.INSTANCE) {
numActiveOperations.incrementAndGet();
- ((AbstractOperationCallback) modificationCallback).incrementLocalNumActiveOperations();
+ ((AbstractOperationCallback) modificationCallback).beforeOperation();
}
}
@@ -177,7 +182,7 @@
//modificationCallback can be NoOpOperationCallback when redo/undo operations are executed.
if (modificationCallback != NoOpOperationCallback.INSTANCE) {
numActiveOperations.decrementAndGet();
- ((AbstractOperationCallback) modificationCallback).decrementLocalNumActiveOperations();
+ ((AbstractOperationCallback) modificationCallback).afterOperation();
}
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java
index 1c610ac..3879fb8 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/dataflow/LSMInsertDeleteOperatorNodePushable.java
@@ -36,11 +36,13 @@
import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.api.ITupleFilterFactory;
import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.dataflow.LSMIndexInsertUpdateDeleteOperatorNodePushable;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
public class LSMInsertDeleteOperatorNodePushable extends LSMIndexInsertUpdateDeleteOperatorNodePushable {
@@ -88,7 +90,8 @@
writer.open();
modCallback =
modOpCallbackFactory.createModificationOperationCallback(indexHelper.getResource(), ctx, this);
- indexAccessor = lsmIndex.createAccessor(modCallback, NoOpOperationCallback.INSTANCE);
+ IIndexAccessParameters iap = new IndexAccessParameters(modCallback, NoOpOperationCallback.INSTANCE);
+ indexAccessor = lsmIndex.createAccessor(iap);
if (tupleFilterFactory != null) {
tupleFilter = tupleFilterFactory.createTupleFilter(ctx);
frameTuple = new FrameTupleReference();
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ACIDException.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ACIDException.java
index 7b489f2..77634eb 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ACIDException.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ACIDException.java
@@ -27,7 +27,7 @@
* ACIDException encountered during crash recovery shall not have a transaction
* context as recovery does not happen as part of a transaction.
*/
-public class ACIDException extends Exception {
+public class ACIDException extends RuntimeException {
private static final long serialVersionUID = -8855848112541877323L;
private ITransactionContext txnContext;
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
index 6d3b6c2..a4cf64a 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/exceptions/ErrorCode.java
@@ -132,6 +132,7 @@
public static final int CANNOT_CREATE_SEC_PRIMARY_IDX_ON_EXT_DATASET = 1053;
public static final int COMPILATION_FAILED_DUE_TO_REPLICATE_OP = 1054;
public static final int COMPILATION_INCOMPATIBLE_FUNCTION_LANGUAGE = 1055;
+ public static final int TOO_MANY_OPTIONS_FOR_FUNCTION = 1056;
// Feed errors
public static final int DATAFLOW_ILLEGAL_STATE = 3001;
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
index 736aff6..d4b4215 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/functions/FunctionSignature.java
@@ -28,6 +28,10 @@
private String name;
private int arity;
+ public FunctionSignature(FunctionIdentifier fi) {
+ this(fi.getNamespace(), fi.getName(), fi.getArity());
+ }
+
public FunctionSignature(String namespace, String name, int arity) {
this.namespace = namespace;
this.name = name;
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java
index 5fcbac9..c33e2d1 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIOOperationCallback.java
@@ -20,27 +20,26 @@
package org.apache.asterix.common.ioopcallbacks;
import java.util.List;
-import java.util.logging.Level;
-import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.LongPointable;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.common.freepage.MutableArrayValueReference;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.DiskComponentMetadata;
-import org.apache.hyracks.storage.am.lsm.common.impls.LSMDiskComponentId;
+import org.apache.hyracks.storage.am.lsm.common.impls.EmptyComponent;
import org.apache.hyracks.storage.am.lsm.common.util.ComponentUtils;
+import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
// A single LSMIOOperationCallback per LSM index used to perform actions around Flush and Merge operations
public abstract class AbstractLSMIOOperationCallback implements ILSMIOOperationCallback {
- private static final Logger LOGGER = Logger.getLogger(AbstractLSMIOOperationCallback.class.getName());
public static final MutableArrayValueReference LSN_KEY = new MutableArrayValueReference("LSN".getBytes());
public static final long INVALID = -1L;
@@ -56,8 +55,11 @@
// Index of the currently being written to component
protected int writeIndex;
- public AbstractLSMIOOperationCallback(ILSMIndex lsmIndex) {
+ protected final ILSMComponentIdGenerator idGenerator;
+
+ public AbstractLSMIOOperationCallback(ILSMIndex lsmIndex, ILSMComponentIdGenerator idGenerator) {
this.lsmIndex = lsmIndex;
+ this.idGenerator = idGenerator;
int count = lsmIndex.getNumberOfAllMemoryComponents();
mutableLastLSNs = new long[count];
firstLSNs = new long[count];
@@ -67,8 +69,8 @@
}
@Override
- public void beforeOperation(LSMOperationType opType) throws HyracksDataException {
- if (opType == LSMOperationType.FLUSH) {
+ public void beforeOperation(LSMIOOperationType opType) throws HyracksDataException {
+ if (opType == LSMIOOperationType.FLUSH) {
/*
* This method was called on the scheduleFlush operation.
* We set the lastLSN to the last LSN for the index (the LSN for the flush log)
@@ -87,9 +89,9 @@
}
@Override
- public void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent) {
+ public void afterFinalize(LSMIOOperationType opType, ILSMDiskComponent newComponent) throws HyracksDataException {
// The operation was complete and the next I/O operation for the LSM index didn't start yet
- if (opType == LSMOperationType.FLUSH && newComponent != null) {
+ if (opType == LSMIOOperationType.FLUSH && newComponent != null) {
synchronized (this) {
flushRequested[readIndex] = false;
// if the component which just finished flushing is the component that will be modified next,
@@ -99,6 +101,13 @@
}
readIndex = (readIndex + 1) % mutableLastLSNs.length;
}
+ if (newComponent == EmptyComponent.INSTANCE) {
+ // This component was just deleted, we refresh the component id, when it gets recycled, it will get
+ // the new id from the component id generator.
+ // It is assumed that the component delete caller will ensure that corresponding components in secondary
+ // indexes are deleted as well
+ idGenerator.refresh();
+ }
}
}
@@ -114,40 +123,22 @@
return pointable.getLength() == 0 ? INVALID : pointable.longValue();
}
- private ILSMDiskComponentId getComponentId(List<ILSMComponent> oldComponents) throws HyracksDataException {
- if (oldComponents == null) {
- //if oldComponents == null, then getComponentLSN would treat it as a flush operation,
- //and return the LSN for the flushed component
- long id = getComponentLSN(null);
- if (id == 0) {
- LOGGER.log(Level.WARNING, "Flushing a memory component without setting the LSN");
- id = ILSMDiskComponentId.NOT_FOUND;
- }
- return new LSMDiskComponentId(id, id);
- } else {
- long minId = Long.MAX_VALUE;
- long maxId = Long.MIN_VALUE;
- for (ILSMComponent oldComponent : oldComponents) {
- ILSMDiskComponentId oldComponentId = ((ILSMDiskComponent) oldComponent).getComponentId();
- if (oldComponentId.getMinId() < minId) {
- minId = oldComponentId.getMinId();
- }
- if (oldComponentId.getMaxId() > maxId) {
- maxId = oldComponentId.getMaxId();
- }
- }
- return new LSMDiskComponentId(minId, maxId);
+ private ILSMComponentId getMergedComponentId(List<ILSMComponent> mergedComponents) throws HyracksDataException {
+ if (mergedComponents == null || mergedComponents.isEmpty()) {
+ return null;
}
+ return LSMComponentIdUtils.union(mergedComponents.get(0).getId(),
+ mergedComponents.get(mergedComponents.size() - 1).getId());
+
}
- private void putComponentIdIntoMetadata(ILSMDiskComponent component, List<ILSMComponent> oldComponents)
- throws HyracksDataException {
- DiskComponentMetadata metadata = component.getMetadata();
- ILSMDiskComponentId componentId = getComponentId(oldComponents);
- metadata.put(ILSMDiskComponentId.COMPONENT_ID_MIN_KEY,
- LongPointable.FACTORY.createPointable(componentId.getMinId()));
- metadata.put(ILSMDiskComponentId.COMPONENT_ID_MAX_KEY,
- LongPointable.FACTORY.createPointable(componentId.getMaxId()));
+ private void putComponentIdIntoMetadata(LSMIOOperationType opType, ILSMDiskComponent newComponent,
+ List<ILSMComponent> oldComponents) throws HyracksDataException {
+ // the id of flushed component is set when we copy the metadata of the memory component
+ if (opType == LSMIOOperationType.MERGE) {
+ ILSMComponentId componentId = getMergedComponentId(oldComponents);
+ LSMComponentIdUtils.persist(componentId, newComponent.getMetadata());
+ }
}
public synchronized void updateLastLSN(long lastLSN) {
@@ -183,20 +174,19 @@
}
@Override
- public void afterOperation(LSMOperationType opType, List<ILSMComponent> oldComponents,
+ public void afterOperation(LSMIOOperationType opType, List<ILSMComponent> oldComponents,
ILSMDiskComponent newComponent) throws HyracksDataException {
//TODO: Copying Filters and all content of the metadata pages for flush operation should be done here
if (newComponent != null) {
putLSNIntoMetadata(newComponent, oldComponents);
- putComponentIdIntoMetadata(newComponent, oldComponents);
- if (opType == LSMOperationType.MERGE) {
+ putComponentIdIntoMetadata(opType, newComponent, oldComponents);
+ if (opType == LSMIOOperationType.MERGE) {
// In case of merge, oldComponents are never null
LongPointable markerLsn =
LongPointable.FACTORY.createPointable(ComponentUtils.getLong(oldComponents.get(0).getMetadata(),
ComponentUtils.MARKER_LSN_KEY, ComponentUtils.NOT_FOUND));
newComponent.getMetadata().put(ComponentUtils.MARKER_LSN_KEY, markerLsn);
}
-
}
}
@@ -220,12 +210,12 @@
@Override
public void recycled(ILSMMemoryComponent component) throws HyracksDataException {
- // No op
+ component.resetId(idGenerator.getId());
}
@Override
public void allocated(ILSMMemoryComponent component) throws HyracksDataException {
- // No op
+ component.resetId(idGenerator.getId());
}
/**
@@ -237,4 +227,5 @@
*/
public abstract long getComponentFileLSNOffset(ILSMDiskComponent component, String componentFilePath)
throws HyracksDataException;
+
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIndexIOOperationCallbackFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIndexIOOperationCallbackFactory.java
new file mode 100644
index 0000000..5dff7f4
--- /dev/null
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/AbstractLSMIndexIOOperationCallbackFactory.java
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.common.ioopcallbacks;
+
+import java.io.ObjectStreamException;
+
+import org.apache.hyracks.api.application.INCServiceContext;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentId;
+
+public abstract class AbstractLSMIndexIOOperationCallbackFactory implements ILSMIOOperationCallbackFactory {
+
+ private static final long serialVersionUID = 1L;
+
+ protected ILSMComponentIdGeneratorFactory idGeneratorFactory;
+
+ protected transient INCServiceContext ncCtx;
+
+ public AbstractLSMIndexIOOperationCallbackFactory(ILSMComponentIdGeneratorFactory idGeneratorFactory) {
+ this.idGeneratorFactory = idGeneratorFactory;
+ }
+
+ @Override
+ public void initialize(INCServiceContext ncCtx) {
+ this.ncCtx = ncCtx;
+ }
+
+ protected ILSMComponentIdGenerator getComponentIdGenerator() {
+ return idGeneratorFactory.getComponentIdGenerator(ncCtx);
+ }
+
+ private void readObjectNoData() throws ObjectStreamException {
+ idGeneratorFactory = new ILSMComponentIdGeneratorFactory() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public ILSMComponentIdGenerator getComponentIdGenerator(INCServiceContext serviceCtx) {
+ // used for backward compatibility
+ // if idGeneratorFactory is not set for legacy lsm indexes, we return a default
+ // component id generator which always generates the missing component id.
+ return new ILSMComponentIdGenerator() {
+ @Override
+ public void refresh() {
+ // No op
+ }
+
+ @Override
+ public ILSMComponentId getId() {
+ return LSMComponentId.MISSING_COMPONENT_ID;
+ }
+ };
+ }
+ };
+ }
+}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java
index c7fbb65..c1ee03b 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallback.java
@@ -23,13 +23,14 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTreeFileManager;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
public class LSMBTreeIOOperationCallback extends AbstractLSMIOOperationCallback {
- public LSMBTreeIOOperationCallback(ILSMIndex index) {
- super(index);
+ public LSMBTreeIOOperationCallback(ILSMIndex index, ILSMComponentIdGenerator idGenerator) {
+ super(index, idGenerator);
}
@Override
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallbackFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallbackFactory.java
index e3abb6b..4ef12ef 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallbackFactory.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeIOOperationCallbackFactory.java
@@ -19,21 +19,20 @@
package org.apache.asterix.common.ioopcallbacks;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-public class LSMBTreeIOOperationCallbackFactory implements ILSMIOOperationCallbackFactory {
+public class LSMBTreeIOOperationCallbackFactory extends AbstractLSMIndexIOOperationCallbackFactory {
private static final long serialVersionUID = 1L;
- public static LSMBTreeIOOperationCallbackFactory INSTANCE = new LSMBTreeIOOperationCallbackFactory();
-
- private LSMBTreeIOOperationCallbackFactory() {
+ public LSMBTreeIOOperationCallbackFactory(ILSMComponentIdGeneratorFactory idGeneratorFactory) {
+ super(idGeneratorFactory);
}
@Override
public ILSMIOOperationCallback createIoOpCallback(ILSMIndex index) {
- return new LSMBTreeIOOperationCallback(index);
+ return new LSMBTreeIOOperationCallback(index, getComponentIdGenerator());
}
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java
index 67d623a..b43fb2f 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallback.java
@@ -22,13 +22,14 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTreeWithBuddyFileManager;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
public class LSMBTreeWithBuddyIOOperationCallback extends AbstractLSMIOOperationCallback {
- public LSMBTreeWithBuddyIOOperationCallback(ILSMIndex lsmIndex) {
- super(lsmIndex);
+ public LSMBTreeWithBuddyIOOperationCallback(ILSMIndex lsmIndex, ILSMComponentIdGenerator idGenerator) {
+ super(lsmIndex, idGenerator);
}
@Override
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackFactory.java
index 93f505c..6727bf6 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackFactory.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackFactory.java
@@ -18,22 +18,20 @@
*/
package org.apache.asterix.common.ioopcallbacks;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-public class LSMBTreeWithBuddyIOOperationCallbackFactory implements ILSMIOOperationCallbackFactory {
+public class LSMBTreeWithBuddyIOOperationCallbackFactory extends AbstractLSMIndexIOOperationCallbackFactory {
private static final long serialVersionUID = 1L;
- public static final LSMBTreeWithBuddyIOOperationCallbackFactory INSTANCE =
- new LSMBTreeWithBuddyIOOperationCallbackFactory();
-
- private LSMBTreeWithBuddyIOOperationCallbackFactory() {
+ public LSMBTreeWithBuddyIOOperationCallbackFactory(ILSMComponentIdGeneratorFactory idGeneratorFactory) {
+ super(idGeneratorFactory);
}
@Override
public ILSMIOOperationCallback createIoOpCallback(ILSMIndex index) {
- return new LSMBTreeWithBuddyIOOperationCallback(index);
+ return new LSMBTreeWithBuddyIOOperationCallback(index, getComponentIdGenerator());
}
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java
index 2d27b78..015cd38 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallback.java
@@ -21,6 +21,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.invertedindex.impls.LSMInvertedIndexDiskComponent;
@@ -28,8 +29,8 @@
public class LSMInvertedIndexIOOperationCallback extends AbstractLSMIOOperationCallback {
- public LSMInvertedIndexIOOperationCallback(ILSMIndex index) {
- super(index);
+ public LSMInvertedIndexIOOperationCallback(ILSMIndex index, ILSMComponentIdGenerator idGenerator) {
+ super(index, idGenerator);
}
@Override
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallbackFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallbackFactory.java
index 47a67b2..a2712d1 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallbackFactory.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMInvertedIndexIOOperationCallbackFactory.java
@@ -19,22 +19,20 @@
package org.apache.asterix.common.ioopcallbacks;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-public class LSMInvertedIndexIOOperationCallbackFactory implements ILSMIOOperationCallbackFactory {
+public class LSMInvertedIndexIOOperationCallbackFactory extends AbstractLSMIndexIOOperationCallbackFactory {
private static final long serialVersionUID = 1L;
- public static final LSMInvertedIndexIOOperationCallbackFactory INSTANCE =
- new LSMInvertedIndexIOOperationCallbackFactory();
-
- private LSMInvertedIndexIOOperationCallbackFactory() {
+ public LSMInvertedIndexIOOperationCallbackFactory(ILSMComponentIdGeneratorFactory idGeneratorFactory) {
+ super(idGeneratorFactory);
}
@Override
public ILSMIOOperationCallback createIoOpCallback(ILSMIndex index) {
- return new LSMInvertedIndexIOOperationCallback(index);
+ return new LSMInvertedIndexIOOperationCallback(index, getComponentIdGenerator());
}
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java
index 9ba99f9..bc79074 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallback.java
@@ -21,6 +21,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.rtree.impls.LSMRTreeFileManager;
@@ -28,8 +29,8 @@
public class LSMRTreeIOOperationCallback extends AbstractLSMIOOperationCallback {
- public LSMRTreeIOOperationCallback(ILSMIndex index) {
- super(index);
+ public LSMRTreeIOOperationCallback(ILSMIndex index, ILSMComponentIdGenerator idGenerator) {
+ super(index, idGenerator);
}
@Override
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallbackFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallbackFactory.java
index 14cf648..087aaae 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallbackFactory.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/ioopcallbacks/LSMRTreeIOOperationCallbackFactory.java
@@ -19,21 +19,20 @@
package org.apache.asterix.common.ioopcallbacks;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-public class LSMRTreeIOOperationCallbackFactory implements ILSMIOOperationCallbackFactory {
+public class LSMRTreeIOOperationCallbackFactory extends AbstractLSMIndexIOOperationCallbackFactory {
private static final long serialVersionUID = 1L;
- public static final LSMRTreeIOOperationCallbackFactory INSTANCE = new LSMRTreeIOOperationCallbackFactory();
-
- private LSMRTreeIOOperationCallbackFactory() {
+ public LSMRTreeIOOperationCallbackFactory(ILSMComponentIdGeneratorFactory idGeneratorFactory) {
+ super(idGeneratorFactory);
}
@Override
public ILSMIOOperationCallback createIoOpCallback(ILSMIndex index) {
- return new LSMRTreeIOOperationCallback(index);
+ return new LSMRTreeIOOperationCallback(index, getComponentIdGenerator());
}
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/replication/INCLifecycleMessage.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/replication/INCLifecycleMessage.java
index 87b0856..cb9fa8f 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/replication/INCLifecycleMessage.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/replication/INCLifecycleMessage.java
@@ -22,16 +22,16 @@
public interface INCLifecycleMessage extends IMessage {
- public enum MessageType {
+ enum MessageType {
REPLAY_LOGS_REQUEST,
REPLAY_LOGS_RESPONSE,
PREPARE_FAILBACK_REQUEST,
PREPARE_FAILBACK_RESPONSE,
COMPLETE_FAILBACK_REQUEST,
COMPLETE_FAILBACK_RESPONSE,
- STARTUP_TASK_REQUEST,
- STARTUP_TASK_RESPONSE,
- STARTUP_TASK_RESULT,
+ REGISTRATION_TASKS_REQUEST,
+ REGISTRATION_TASKS_RESPONSE,
+ REGISTRATION_TASKS_RESULT,
TAKEOVER_PARTITION_REQUEST,
TAKEOVER_PARTITION_RESPONSE,
TAKEOVER_METADATA_NODE_REQUEST,
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallback.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallback.java
index 9844344..098bbd4 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallback.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallback.java
@@ -31,14 +31,16 @@
protected final ITransactionContext txnCtx;
protected final ILockManager lockManager;
protected final long[] longHashes;
+ protected final long resourceId;
- public AbstractOperationCallback(DatasetId datasetId, int[] primaryKeyFields, ITransactionContext txnCtx,
- ILockManager lockManager) {
+ public AbstractOperationCallback(DatasetId datasetId, long resourceId, int[] primaryKeyFields,
+ ITransactionContext txnCtx, ILockManager lockManager) {
this.datasetId = datasetId;
+ this.resourceId = resourceId;
this.primaryKeyFields = primaryKeyFields;
this.txnCtx = txnCtx;
this.lockManager = lockManager;
- this.longHashes = new long[2];
+ longHashes = new long[2];
}
public int computePrimaryKeyHashValue(ITupleReference tuple, int[] primaryKeyFields) {
@@ -46,12 +48,11 @@
return Math.abs((int) longHashes[0]);
}
- public void incrementLocalNumActiveOperations() {
- txnCtx.incrementNumActiveOperations();
+ public void beforeOperation() {
+ txnCtx.beforeOperation(resourceId);
}
- public void decrementLocalNumActiveOperations() {
- txnCtx.decrementNumActiveOperations();
+ public void afterOperation() {
+ txnCtx.afterOperation(resourceId);
}
-
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallbackFactory.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallbackFactory.java
index d1d869e..d2b1276 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallbackFactory.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/AbstractOperationCallbackFactory.java
@@ -26,15 +26,15 @@
public abstract class AbstractOperationCallbackFactory implements Serializable {
private static final long serialVersionUID = 1L;
- protected final JobId jobId;
+ protected final TxnId txnId;
protected final int datasetId;
protected final int[] primaryKeyFields;
protected final ITransactionSubsystemProvider txnSubsystemProvider;
protected final byte resourceType;
- public AbstractOperationCallbackFactory(JobId jobId, int datasetId, int[] primaryKeyFields,
+ public AbstractOperationCallbackFactory(TxnId txnId, int datasetId, int[] primaryKeyFields,
ITransactionSubsystemProvider txnSubsystemProvider, byte resourceType) {
- this.jobId = jobId;
+ this.txnId = txnId;
this.datasetId = datasetId;
this.primaryKeyFields = primaryKeyFields;
this.txnSubsystemProvider = txnSubsystemProvider;
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/Checkpoint.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/Checkpoint.java
index a4c41df..825c7d1 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/Checkpoint.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/Checkpoint.java
@@ -31,19 +31,19 @@
private final long checkpointLsn;
private final long minMCTFirstLsn;
- private final int maxJobId;
+ private final long maxTxnId;
private final long timeStamp;
private final boolean sharp;
private final int storageVersion;
@JsonCreator
public Checkpoint(@JsonProperty("checkpointLsn") long checkpointLsn,
- @JsonProperty("minMCTFirstLsn") long minMCTFirstLsn, @JsonProperty("maxJobId") int maxJobId,
+ @JsonProperty("minMCTFirstLsn") long minMCTFirstLsn, @JsonProperty("maxJobId") long maxTxnId,
@JsonProperty("timeStamp") long timeStamp, @JsonProperty("sharp") boolean sharp,
@JsonProperty("storageVersion") int storageVersion) {
this.checkpointLsn = checkpointLsn;
this.minMCTFirstLsn = minMCTFirstLsn;
- this.maxJobId = maxJobId;
+ this.maxTxnId = maxTxnId;
this.timeStamp = timeStamp;
this.sharp = sharp;
this.storageVersion = storageVersion;
@@ -57,8 +57,8 @@
return minMCTFirstLsn;
}
- public int getMaxJobId() {
- return maxJobId;
+ public long getMaxTxnId() {
+ return maxTxnId;
}
public long getTimeStamp() {
@@ -108,7 +108,7 @@
final int prime = 31;
int result = 1;
result = prime * result + (int) (checkpointLsn ^ (checkpointLsn >>> 32));
- result = prime * result + maxJobId;
+ result = prime * result + Long.hashCode(maxTxnId);
result = prime * result + (int) (minMCTFirstLsn ^ (minMCTFirstLsn >>> 32));
result = prime * result + (sharp ? 1231 : 1237);
result = prime * result + storageVersion;
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogReader.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogReader.java
index da188e3..8539e2b 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogReader.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogReader.java
@@ -18,18 +18,34 @@
*/
package org.apache.asterix.common.transactions;
-import org.apache.asterix.common.exceptions.ACIDException;
-
public interface ILogReader {
- public void initializeScan(long beginLSN) throws ACIDException;
+ /**
+ * Sets the log reader position at log sequence number with value {@code lsn}.
+ *
+ * @param lsn
+ */
+ void setPosition(long lsn);
- //for scanning
- public ILogRecord next() throws ACIDException;
+ /**
+ * Reads and returns the log record located at the log reader current position. After reading the log record,
+ * the log reader position is incremented by the size of the read log.
+ *
+ * @return the log record
+ */
+ ILogRecord next();
- //for random reading
- public ILogRecord read(long readLSN) throws ACIDException;
+ /**
+ * Reads and returns the log record with log sequence number {@code lsn}.
+ *
+ * @param lsn
+ * @return The log record
+ */
+ ILogRecord read(long lsn);
- public void close() throws ACIDException;
+ /**
+ * Closes the log reader and any resources used.
+ */
+ void close();
-}
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogRecord.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogRecord.java
index 6ee0980..4090b65 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogRecord.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ILogRecord.java
@@ -32,36 +32,33 @@
LARGE_RECORD
}
- public static final int CHKSUM_LEN = Long.BYTES;
- public static final int FLDCNT_LEN = Integer.BYTES;
- public static final int DS_LEN = Integer.BYTES;
- public static final int LOG_SOURCE_LEN = Byte.BYTES;
- public static final int LOGRCD_SZ_LEN = Integer.BYTES;
- public static final int NEWOP_LEN = Byte.BYTES;
- public static final int NEWVALSZ_LEN = Integer.BYTES;
- public static final int PKHASH_LEN = Integer.BYTES;
- public static final int PKSZ_LEN = Integer.BYTES;
- public static final int PRVLSN_LEN = Long.BYTES;
- public static final int RS_PARTITION_LEN = Integer.BYTES;
- public static final int RSID_LEN = Long.BYTES;
- public static final int SEQ_NUM_LEN = Long.BYTES;
- public static final int TYPE_LEN = Byte.BYTES;
- public static final int UUID_LEN = Long.BYTES;
+ int CHKSUM_LEN = Long.BYTES;
+ int FLDCNT_LEN = Integer.BYTES;
+ int DS_LEN = Integer.BYTES;
+ int LOG_SOURCE_LEN = Byte.BYTES;
+ int LOGRCD_SZ_LEN = Integer.BYTES;
+ int NEWOP_LEN = Byte.BYTES;
+ int NEWVALSZ_LEN = Integer.BYTES;
+ int PKHASH_LEN = Integer.BYTES;
+ int PKSZ_LEN = Integer.BYTES;
+ int PRVLSN_LEN = Long.BYTES;
+ int RS_PARTITION_LEN = Integer.BYTES;
+ int RSID_LEN = Long.BYTES;
+ int SEQ_NUM_LEN = Long.BYTES;
+ int TYPE_LEN = Byte.BYTES;
+ int UUID_LEN = Long.BYTES;
- public static final int ALL_RECORD_HEADER_LEN = LOG_SOURCE_LEN + TYPE_LEN + JobId.BYTES;
- public static final int ENTITYCOMMIT_UPDATE_HEADER_LEN = RS_PARTITION_LEN + DatasetId.BYTES + PKHASH_LEN + PKSZ_LEN;
- public static final int UPDATE_LSN_HEADER = RSID_LEN + LOGRCD_SZ_LEN;
- public static final int UPDATE_BODY_HEADER = FLDCNT_LEN + NEWOP_LEN + NEWVALSZ_LEN;
- // What are these fields? vvvvv
- public static final int REMOTE_FLUSH_LOG_EXTRA_FIELDS_LEN = Long.BYTES + Integer.BYTES + Integer.BYTES;
+ int ALL_RECORD_HEADER_LEN = LOG_SOURCE_LEN + TYPE_LEN + TxnId.BYTES;
+ int ENTITYCOMMIT_UPDATE_HEADER_LEN = RS_PARTITION_LEN + DatasetId.BYTES + PKHASH_LEN + PKSZ_LEN;
+ int UPDATE_LSN_HEADER = RSID_LEN + LOGRCD_SZ_LEN;
+ int UPDATE_BODY_HEADER = FLDCNT_LEN + NEWOP_LEN + NEWVALSZ_LEN;
- // How are the following computed?
- public static final int JOB_TERMINATE_LOG_SIZE = ALL_RECORD_HEADER_LEN + CHKSUM_LEN;
- public static final int ENTITY_COMMIT_LOG_BASE_SIZE = 30; // ALL_RECORD_HEADER_LEN + CHKSUM_LEN +?
- public static final int UPDATE_LOG_BASE_SIZE = 51; // ALL_RECORD_HEADER_LEN + CHKSUM_LEN +?
- public static final int FLUSH_LOG_SIZE = 18; // ALL_RECORD_HEADER_LEN + CHKSUM_LEN +?
- public static final int WAIT_LOG_SIZE = ALL_RECORD_HEADER_LEN + CHKSUM_LEN;
- public static final int MARKER_BASE_LOG_SIZE =
+ int JOB_TERMINATE_LOG_SIZE = ALL_RECORD_HEADER_LEN + CHKSUM_LEN;
+ int ENTITY_COMMIT_LOG_BASE_SIZE = ALL_RECORD_HEADER_LEN + ENTITYCOMMIT_UPDATE_HEADER_LEN + CHKSUM_LEN;
+ int UPDATE_LOG_BASE_SIZE = ENTITY_COMMIT_LOG_BASE_SIZE + UPDATE_LSN_HEADER + UPDATE_BODY_HEADER;
+ int FLUSH_LOG_SIZE = ALL_RECORD_HEADER_LEN + DatasetId.BYTES + CHKSUM_LEN;
+ int WAIT_LOG_SIZE = ALL_RECORD_HEADER_LEN + CHKSUM_LEN;
+ int MARKER_BASE_LOG_SIZE =
ALL_RECORD_HEADER_LEN + CHKSUM_LEN + DS_LEN + RS_PARTITION_LEN + PRVLSN_LEN + LOGRCD_SZ_LEN;
public RecordReadStatus readLogRecord(ByteBuffer buffer);
@@ -80,9 +77,9 @@
public void setLogType(byte logType);
- public int getJobId();
+ long getTxnId();
- public void setJobId(int jobId);
+ void setTxnId(long jobId);
public int getDatasetId();
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/IRecoveryManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/IRecoveryManager.java
index 7965aa5..dea7a67 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/IRecoveryManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/IRecoveryManager.java
@@ -98,13 +98,13 @@
/**
* Creates a temporary file to be used during recovery
*
- * @param jobId
+ * @param txnId
* @param fileName
* @return A file to the created temporary file
* @throws IOException
- * if the file for the specified {@code jobId} with the {@code fileName} already exists
+ * if the file for the specified {@code txnId} with the {@code fileName} already exists
*/
- File createJobRecoveryFile(int jobId, String fileName) throws IOException;
+ File createJobRecoveryFile(long txnId, String fileName) throws IOException;
/**
* Deletes all temporary recovery files
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionContext.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionContext.java
index 20ede18..c4a2d03 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionContext.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionContext.java
@@ -19,41 +19,136 @@
package org.apache.asterix.common.transactions;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+/**
+ * A typical transaction lifecycle goes through the following steps:
+ * 1. {@link ITransactionContext#register(long, ILSMIndex, IModificationOperationCallback, boolean)}
+ * 2. {@link ITransactionContext#beforeOperation(long)}
+ * 3. {@link ITransactionContext#notifyUpdateCommitted(long)}
+ * 4. {@link ITransactionContext#notifyEntityCommitted}
+ * 5. {@link ITransactionContext#afterOperation(long)}
+ * 6. {@link ITransactionContext#complete()}
+ */
public interface ITransactionContext {
- public void registerIndexAndCallback(long resourceId, ILSMIndex index, AbstractOperationCallback callback,
- boolean isPrimaryIndex);
+ /**
+ * Registers {@link ILSMIndex} in the transaction. Registering an index
+ * must be done before any operation is performed on the index by this
+ * transaction.
+ *
+ * @param resourceId
+ * @param index
+ * @param callback
+ * @param primaryIndex
+ */
+ void register(long resourceId, ILSMIndex index, IModificationOperationCallback callback, boolean primaryIndex);
- public JobId getJobId();
+ /**
+ * Gets the unique transaction id.
+ *
+ * @return the unique transaction id
+ */
+ TxnId getTxnId();
- public void setTimeout(boolean isTimeout);
+ /**
+ * Sets a flag indicating that the transaction timed out.
+ *
+ * @param isTimeout
+ */
+ void setTimeout(boolean isTimeout);
- public boolean isTimeout();
+ /**
+ * Tests if the transaction was timed out.
+ *
+ * @return true if this transaction timed out. Otherwise false.
+ */
+ boolean isTimeout();
- public void setTxnState(int txnState);
+ /**
+ * Sets the state if this transaction.
+ *
+ * @param txnState
+ */
+ void setTxnState(int txnState);
- public int getTxnState();
+ /**
+ * Gets the current state of this transaction.
+ *
+ * @return the current state of this transaction
+ */
+ int getTxnState();
- public long getFirstLSN();
+ /**
+ * Gets the first log sequence number of this transaction.
+ *
+ * @return the first log sequence number
+ */
+ long getFirstLSN();
- public long getLastLSN();
+ /**
+ * Gets the last log sequence number of this transactions.
+ *
+ * @return the last log sequence number
+ */
+ long getLastLSN();
- public void setLastLSN(long LSN);
+ /**
+ * Sets the last log sequence number of this transactions.
+ *
+ * @param newValue
+ */
+ void setLastLSN(long newValue);
- public boolean isWriteTxn();
+ /**
+ * Tests if this is a write transaction.
+ *
+ * @return true if this is a write transaction, otherwise false.
+ */
+ boolean isWriteTxn();
- public void setWriteTxn(boolean isWriterTxn);
+ /**
+ * Sets a flag indication that this is a write transaction.
+ *
+ * @param isWriterTxn
+ */
+ void setWriteTxn(boolean isWriterTxn);
- public String prettyPrint();
+ /**
+ * Called before an operation is performed on index
+ * with resource id {@code resourceId}.
+ *
+ * @param resourceId
+ */
+ void beforeOperation(long resourceId);
- public void setMetadataTransaction(boolean isMetadataTxn);
+ /**
+ * Called to notify the transaction that an update log belonging
+ * to this transaction on index with {@code resourceId} has been
+ * flushed to disk.
+ *
+ * @param resourceId
+ */
+ void notifyUpdateCommitted(long resourceId);
- public boolean isMetadataTransaction();
+ /**
+ * Called to notify the transaction that an entity commit
+ * log belonging to this transaction has been flushed to
+ * disk.
+ */
+ void notifyEntityCommitted();
- public void notifyOptracker(boolean isJobLevelCommit);
+ /**
+ * Called after an operation is performed on index
+ * with resource id {@code resourceId}.
+ *
+ * @param resourceId
+ */
+ void afterOperation(long resourceId);
- public void incrementNumActiveOperations();
-
- public void decrementNumActiveOperations();
+ /**
+ * Called when no further operations will be performed by the transaction
+ * so that any resources held by the transaction may be released
+ */
+ void complete();
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionManager.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionManager.java
index 0123814..396d3f6 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionManager.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/ITransactionManager.java
@@ -24,109 +24,88 @@
* Provides APIs for managing life cycle of a transaction, that is beginning a
* transaction and aborting/committing the transaction.
*/
-
public interface ITransactionManager {
/**
* A transaction may be in any of the following states ACTIVE: The
- * transaction is ongoing and has not yet committed/aborted. COMMITTD: The
+ * transaction is ongoing and has not yet committed/aborted. COMMITTED: The
* transaction has committed. ABORTED: The transaction has aborted.
* TIMED_OUT: The transaction has timed out waiting to acquire a lock.
*/
- public static final int ACTIVE = 0;
- public static final int COMMITTED = 1;
- public static final int ABORTED = 2;
- public static final int TIMED_OUT = 3;
+ int ACTIVE = 0;
+ int COMMITTED = 1;
+ int ABORTED = 2;
+ int TIMED_OUT = 3;
+
+ enum AtomicityLevel {
+ /**
+ * all records are committed or nothing
+ */
+ ATOMIC,
+ /**
+ * any record with entity commit log
+ */
+ ENTITY_LEVEL
+ }
+
+ enum TransactionMode {
+ /**
+ * Transaction performs only read operations
+ */
+ READ,
+ /**
+ * Transaction may perform read and write operations
+ */
+ READ_WRITE
+ }
/**
* Begins a transaction identified by a transaction id and returns the
* associated transaction context.
*
- * @param jobId
- * a unique value for the transaction id.
- * @return the transaction context associated with the initiated transaction
- * @see ITransactionContext
+ * @param txnId
+ * @param options
+ * @return The transaction context
* @throws ACIDException
*/
- public ITransactionContext beginTransaction(JobId jobId) throws ACIDException;
+ ITransactionContext beginTransaction(TxnId txnId, TransactionOptions options) throws ACIDException;
/**
* Returns the transaction context of an active transaction given the
* transaction id.
*
- * @param jobId
- * a unique value for the transaction id.
- * @param createIfNotExist
- * TODO
- * @return
+ * @param txnId
+ * @return The transaction context
* @throws ACIDException
*/
- public ITransactionContext getTransactionContext(JobId jobId, boolean createIfNotExist) throws ACIDException;
+ ITransactionContext getTransactionContext(TxnId txnId) throws ACIDException;
/**
- * Commits a transaction.
+ * Commit a transactions
*
- * @param txnContext
- * the transaction context associated with the transaction
- * @param datasetId
- * TODO
- * @param pkHash
- * TODO
+ * @param txnId
* @throws ACIDException
- * @see ITransactionContextimport org.apache.hyracks.api.job.JobId;
- * @see ACIDException
*/
- public void commitTransaction(ITransactionContext txnContext, DatasetId datasetId, int pkHash)
- throws ACIDException;
+ void commitTransaction(TxnId txnId) throws ACIDException;
/**
* Aborts a transaction.
*
- * @param txnContext
- * the transaction context associated with the transaction
- * @param datasetId
- * TODO
- * @param pkHash
- * TODO
- * @throws ACIDException
- * @see ITransactionContext
- * @see ACIDException
- */
- public void abortTransaction(ITransactionContext txnContext, DatasetId datasetId, int pkHash)
- throws ACIDException;
-
- /**
- * Indicates end of all activity for a transaction. In other words, all
- * participating threads in the transaction have completed the intended
- * task.
- *
- * @param txnContext
- * the transaction context associated with the transaction
- * @param datasetId
- * TODO
- * @param pkHash
- * TODO
- * @param success
- * indicates the success or failure. The transaction is committed
- * or aborted accordingly.
+ * @param txnId
* @throws ACIDException
*/
- public void completedTransaction(ITransactionContext txnContext, DatasetId datasetId, int pkHash,
- boolean success) throws ACIDException;
+ void abortTransaction(TxnId txnId) throws ACIDException;
/**
- * Returns the Transaction Provider for the transaction eco-system. A
- * transaction eco-system consists of a Log Manager, a Recovery Manager, a
- * Transaction Manager and a Lock Manager.
+ * @return The current max txn id.
+ */
+ long getMaxTxnId();
+
+ /**
+ * Sets the maximum txn id to the bigger value of {@code txnId} and its current value.
*
- * @see ITransactionSubsystem
- * @return TransactionProvider
+ * @param txnId
*/
- public ITransactionSubsystem getTransactionSubsystem();
-
- /**
- * @return The current max job id.
- */
- int getMaxJobId();
+ void ensureMaxTxnId(long txnId);
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java
index e80cfa6..68afb2a 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/LogRecord.java
@@ -32,10 +32,10 @@
/**
* == LogRecordFormat ==
* ---------------------------
- * [Header1] (6 bytes) : for all log types
+ * [Header1] (10 bytes) : for all log types
* LogSource(1)
* LogType(1)
- * JobId(4)
+ * TxnId(8)
* ---------------------------
* [Header2] (16 bytes + PKValueSize) : for entity_commit, upsert_entity_commit, and update log types
* DatasetId(4) //stored in dataset_dataset in Metadata Node
@@ -57,16 +57,6 @@
* [Tail] (8 bytes) : for all log types
* Checksum(8)
* ---------------------------
- * = LogSize =
- * 1) JOB_COMMIT_LOG_SIZE: 14 bytes (Header1(6) + Tail(8))
- * 2) ENTITY_COMMIT || UPSERT_ENTITY_COMMIT: (Header1(6) + Header2(16) + Tail(8)) + PKValueSize
- * --> ENTITY_COMMIT_LOG_BASE_SIZE = 30
- * 3) UPDATE: (Header1(6) + Header2(16) + + Header3(20) + Body(9) + Tail(8)) + PKValueSize + NewValueSize
- * --> UPDATE_LOG_BASE_SIZE = 59
- * 4) FLUSH: 18 bytes (Header1(6) + DatasetId(4) + Tail(8))
- * 5) WAIT_LOG_SIZE: 14 bytes (Header1(6) + Tail(8))
- * --> WAIT_LOG only requires LogType Field, but in order to conform the log reader protocol
- * it also includes LogSource and JobId fields.
*/
public class LogRecord implements ILogRecord {
@@ -74,7 +64,7 @@
// ------------- fields in a log record (begin) ------------//
private byte logSource;
private byte logType;
- private int jobId;
+ private long txnId;
private int datasetId;
private int PKHashValue;
private int PKValueSize;
@@ -130,7 +120,7 @@
private void doWriteLogRecord(ByteBuffer buffer) {
buffer.put(logSource);
buffer.put(logType);
- buffer.putInt(jobId);
+ buffer.putLong(txnId);
switch (logType) {
case LogType.ENTITY_COMMIT:
writeEntityInfo(buffer);
@@ -248,7 +238,7 @@
}
logSource = buffer.get();
logType = buffer.get();
- jobId = buffer.getInt();
+ txnId = buffer.getLong();
switch (logType) {
case LogType.FLUSH:
if (buffer.remaining() < ILogRecord.DS_LEN) {
@@ -454,7 +444,7 @@
builder.append(" LSN : ").append(LSN);
builder.append(" LogType : ").append(LogType.toString(logType));
builder.append(" LogSize : ").append(logSize);
- builder.append(" JobId : ").append(jobId);
+ builder.append(" TxnId : ").append(txnId);
if (logType == LogType.ENTITY_COMMIT || logType == LogType.UPDATE) {
builder.append(" DatasetId : ").append(datasetId);
builder.append(" ResourcePartition : ").append(resourcePartition);
@@ -503,13 +493,13 @@
}
@Override
- public int getJobId() {
- return jobId;
+ public long getTxnId() {
+ return txnId;
}
@Override
- public void setJobId(int jobId) {
- this.jobId = jobId;
+ public void setTxnId(long jobId) {
+ this.txnId = jobId;
}
@Override
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.sqlpp b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/TransactionOptions.java
similarity index 62%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.sqlpp
rename to asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/TransactionOptions.java
index 33c063d..48dc452 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.sqlpp
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/TransactionOptions.java
@@ -16,18 +16,20 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
- */
+package org.apache.asterix.common.transactions;
-use test;
+import static org.apache.asterix.common.transactions.ITransactionManager.AtomicityLevel;
+public class TransactionOptions {
-select element {'id':o.id}
-from MyMiniData as o
-where test.`spatial-intersect`(o.point,test.`create-polygon`([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by o.id
-;
+ private final AtomicityLevel atomicityLevel;
+
+ // TODO add TransactionMode(READ/WRITE) to options
+ public TransactionOptions(AtomicityLevel atomicityLevel) {
+ this.atomicityLevel = atomicityLevel;
+ }
+
+ public AtomicityLevel getAtomicityLevel() {
+ return atomicityLevel;
+ }
+}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/JobId.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/TxnId.java
similarity index 75%
rename from asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/JobId.java
rename to asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/TxnId.java
index 9654a92..b0d38b8 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/JobId.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/transactions/TxnId.java
@@ -20,26 +20,26 @@
import java.io.Serializable;
-public class JobId implements Serializable {
+public class TxnId implements Serializable {
private static final long serialVersionUID = 1L;
/**
- * The number of bytes used to represent {@link JobId} value.
+ * The number of bytes used to represent {@link TxnId} value.
*/
- public static final int BYTES = Integer.BYTES;
+ public static final int BYTES = Long.BYTES;
- private int id;
+ protected long id;
- public JobId(int id) {
+ public TxnId(long id) {
this.id = id;
}
- public int getId() {
+ public long getId() {
return id;
}
@Override
public int hashCode() {
- return id;
+ return Long.hashCode(id);
}
@Override
@@ -47,18 +47,15 @@
if (o == this) {
return true;
}
- if (!(o instanceof JobId)) {
+ if (!(o instanceof TxnId)) {
return false;
}
- return ((JobId) o).id == id;
+ return ((TxnId) o).id == id;
}
@Override
public String toString() {
- return "JID:" + id;
+ return "TxnId:" + id;
}
- public void setId(int jobId) {
- id = jobId;
- }
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InvokeUtil.java
similarity index 75%
rename from asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java
rename to asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InvokeUtil.java
index 4c65c66..c7ac0f4 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InterruptUtil.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/InvokeUtil.java
@@ -18,7 +18,16 @@
*/
package org.apache.asterix.common.utils;
-public class InterruptUtil {
+import java.io.IOException;
+import java.util.concurrent.Callable;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+public class InvokeUtil {
+
+ private static final Logger LOGGER = Logger.getLogger(InvokeUtil.class.getName());
+
/**
* Executes the passed interruptible, retrying if the operation is interrupted. Once the interruptible
* completes, the current thread will be re-interrupted, if the original operation was interrupted.
@@ -82,7 +91,7 @@
}
/**
- * Executes the passed interruptible, retrying if the operation is interrupted. If the operation throws an
+ * Executes the passed interruptible, retrying if the operation is interrupted. If the operation throws an
* exception after being previously interrupted, the current thread will be re-interrupted.
*
* @return true if the original operation was interrupted, otherwise false
@@ -106,6 +115,33 @@
return interrupted;
}
+ public static boolean retryLoop(long duration, TimeUnit durationUnit, long delay, TimeUnit delayUnit,
+ Callable<Boolean> function) throws IOException {
+ long endTime = System.nanoTime() + durationUnit.toNanos(duration);
+ boolean first = true;
+ while (endTime - System.nanoTime() > 0) {
+ if (first) {
+ first = false;
+ } else {
+ try {
+ delayUnit.sleep(delay);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ return false;
+ }
+ }
+ try {
+ if (function.call()) {
+ return true;
+ }
+ } catch (Exception e) {
+ // ignore, retry after delay
+ LOGGER.log(Level.FINE, "Ignoring exception on retryLoop attempt, will retry after delay", e);
+ }
+ }
+ return false;
+ }
+
@FunctionalInterface
public interface Interruptible {
void run() throws InterruptedException;
@@ -115,4 +151,5 @@
public interface ThrowingInterruptible {
void run() throws Exception; // NOSONAR
}
+
}
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/StoragePathUtil.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/StoragePathUtil.java
index 0b9b94b..027f72c 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/StoragePathUtil.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/StoragePathUtil.java
@@ -35,7 +35,6 @@
public class StoragePathUtil {
private static final Logger LOGGER = Logger.getLogger(StoragePathUtil.class.getName());
public static final String PARTITION_DIR_PREFIX = "partition_";
- public static final String TEMP_DATASETS_STORAGE_FOLDER = "temp";
public static final String DATASET_INDEX_NAME_SEPARATOR = "_idx_";
private StoragePathUtil() {
diff --git a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/TransactionUtil.java b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/TransactionUtil.java
index e9f96f9..be4b47f 100644
--- a/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/TransactionUtil.java
+++ b/asterixdb/asterix-common/src/main/java/org/apache/asterix/common/utils/TransactionUtil.java
@@ -34,21 +34,21 @@
public static void formJobTerminateLogRecord(ITransactionContext txnCtx, LogRecord logRecord, boolean isCommit) {
logRecord.setTxnCtx(txnCtx);
- TransactionUtil.formJobTerminateLogRecord(logRecord, txnCtx.getJobId().getId(), isCommit);
+ TransactionUtil.formJobTerminateLogRecord(logRecord, txnCtx.getTxnId().getId(), isCommit);
}
- public static void formJobTerminateLogRecord(LogRecord logRecord, int jobId, boolean isCommit) {
+ public static void formJobTerminateLogRecord(LogRecord logRecord, long txnId, boolean isCommit) {
logRecord.setLogType(isCommit ? LogType.JOB_COMMIT : LogType.ABORT);
logRecord.setDatasetId(-1);
logRecord.setPKHashValue(-1);
- logRecord.setJobId(jobId);
+ logRecord.setTxnId(txnId);
logRecord.computeAndSetLogSize();
}
public static void formFlushLogRecord(LogRecord logRecord, int datasetId, PrimaryIndexOperationTracker opTracker,
String nodeId, int numberOfIndexes) {
logRecord.setLogType(LogType.FLUSH);
- logRecord.setJobId(-1);
+ logRecord.setTxnId(-1);
logRecord.setDatasetId(datasetId);
logRecord.setOpTracker(opTracker);
logRecord.setNumOfFlushedIndexes(numberOfIndexes);
@@ -60,7 +60,7 @@
int PKHashValue, ITupleReference PKValue, int[] PKFields, int resourcePartition, byte entityCommitType) {
logRecord.setTxnCtx(txnCtx);
logRecord.setLogType(entityCommitType);
- logRecord.setJobId(txnCtx.getJobId().getId());
+ logRecord.setTxnId(txnCtx.getTxnId().getId());
logRecord.setDatasetId(datasetId);
logRecord.setPKHashValue(PKHashValue);
logRecord.setPKFieldCnt(PKFields.length);
@@ -76,7 +76,7 @@
logRecord.setTxnCtx(txnCtx);
logRecord.setLogSource(LogSource.LOCAL);
logRecord.setLogType(LogType.MARKER);
- logRecord.setJobId(txnCtx.getJobId().getId());
+ logRecord.setTxnId(txnCtx.getTxnId().getId());
logRecord.setDatasetId(datasetId);
logRecord.setResourcePartition(resourcePartition);
marker.get(); // read the first byte since it is not part of the marker object
diff --git a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
index e428721..39a74ff 100644
--- a/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
+++ b/asterixdb/asterix-common/src/main/resources/asx_errormsg/en.properties
@@ -118,6 +118,7 @@
1053 = Cannot create primary index on external dataset.
1054 = Compilation failed due to some problem in the query plan.
1055 = Incompatible function language. Expect %1$s, but %2$s found.
+1056 = Too many options were specified for %1$s
# Feed Errors
3001 = Illegal state.
diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java
index 9f071bb..2928d90 100644
--- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java
+++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/context/CorrelatedPrefixMergePolicyTest.java
@@ -33,15 +33,14 @@
import org.apache.asterix.common.context.IndexInfo;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.ComponentState;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
-import org.apache.hyracks.storage.am.lsm.common.impls.LSMDiskComponentId;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentId;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -63,14 +62,13 @@
@Test
public void testBasic() {
try {
- List<ILSMDiskComponentId> componentIDs =
- Arrays.asList(new LSMDiskComponentId(5, 5), new LSMDiskComponentId(4, 4),
- new LSMDiskComponentId(3, 3), new LSMDiskComponentId(2, 2), new LSMDiskComponentId(1, 1));
+ List<ILSMComponentId> componentIDs = Arrays.asList(new LSMComponentId(5, 5), new LSMComponentId(4, 4),
+ new LSMComponentId(3, 3), new LSMComponentId(2, 2), new LSMComponentId(1, 1));
- List<ILSMDiskComponentId> resultPrimaryIDs = new ArrayList<>();
+ List<ILSMComponentId> resultPrimaryIDs = new ArrayList<>();
IndexInfo primary = mockIndex(true, componentIDs, resultPrimaryIDs, 0);
- List<ILSMDiskComponentId> resultSecondaryIDs = new ArrayList<>();
+ List<ILSMComponentId> resultSecondaryIDs = new ArrayList<>();
IndexInfo secondary = mockIndex(false, componentIDs, resultSecondaryIDs, 0);
ILSMMergePolicy policy = mockMergePolicy(primary, secondary);
@@ -80,10 +78,10 @@
policy.diskComponentAdded(primary.getIndex(), false);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(4, 4), new LSMDiskComponentId(3, 3),
- new LSMDiskComponentId(2, 2), new LSMDiskComponentId(1, 1)), resultPrimaryIDs);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(4, 4), new LSMDiskComponentId(3, 3),
- new LSMDiskComponentId(2, 2), new LSMDiskComponentId(1, 1)), resultSecondaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(4, 4), new LSMComponentId(3, 3),
+ new LSMComponentId(2, 2), new LSMComponentId(1, 1)), resultPrimaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(4, 4), new LSMComponentId(3, 3),
+ new LSMComponentId(2, 2), new LSMComponentId(1, 1)), resultSecondaryIDs);
} catch (HyracksDataException e) {
Assert.fail(e.getMessage());
@@ -94,14 +92,13 @@
@Test
public void testIDIntervals() {
try {
- List<ILSMDiskComponentId> componentIDs = Arrays.asList(new LSMDiskComponentId(40, 50),
- new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29), new LSMDiskComponentId(20, 24),
- new LSMDiskComponentId(10, 19));
+ List<ILSMComponentId> componentIDs = Arrays.asList(new LSMComponentId(40, 50), new LSMComponentId(30, 35),
+ new LSMComponentId(25, 29), new LSMComponentId(20, 24), new LSMComponentId(10, 19));
- List<ILSMDiskComponentId> resultPrimaryIDs = new ArrayList<>();
+ List<ILSMComponentId> resultPrimaryIDs = new ArrayList<>();
IndexInfo primary = mockIndex(true, componentIDs, resultPrimaryIDs, 0);
- List<ILSMDiskComponentId> resultSecondaryIDs = new ArrayList<>();
+ List<ILSMComponentId> resultSecondaryIDs = new ArrayList<>();
IndexInfo secondary = mockIndex(false, componentIDs, resultSecondaryIDs, 0);
ILSMMergePolicy policy = mockMergePolicy(primary, secondary);
@@ -111,10 +108,10 @@
policy.diskComponentAdded(primary.getIndex(), false);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29),
- new LSMDiskComponentId(20, 24), new LSMDiskComponentId(10, 19)), resultPrimaryIDs);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29),
- new LSMDiskComponentId(20, 24), new LSMDiskComponentId(10, 19)), resultSecondaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29),
+ new LSMComponentId(20, 24), new LSMComponentId(10, 19)), resultPrimaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29),
+ new LSMComponentId(20, 24), new LSMComponentId(10, 19)), resultSecondaryIDs);
} catch (HyracksDataException e) {
Assert.fail(e.getMessage());
@@ -124,15 +121,15 @@
@Test
public void testSecondaryMissing() {
try {
- List<ILSMDiskComponentId> primaryComponentIDs = Arrays.asList(new LSMDiskComponentId(40, 50),
- new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29), new LSMDiskComponentId(20, 24),
- new LSMDiskComponentId(10, 19));
- List<ILSMDiskComponentId> resultPrimaryIDs = new ArrayList<>();
+ List<ILSMComponentId> primaryComponentIDs =
+ Arrays.asList(new LSMComponentId(40, 50), new LSMComponentId(30, 35), new LSMComponentId(25, 29),
+ new LSMComponentId(20, 24), new LSMComponentId(10, 19));
+ List<ILSMComponentId> resultPrimaryIDs = new ArrayList<>();
IndexInfo primary = mockIndex(true, primaryComponentIDs, resultPrimaryIDs, 0);
- List<ILSMDiskComponentId> secondaryComponentIDs = Arrays.asList(new LSMDiskComponentId(30, 35),
- new LSMDiskComponentId(25, 29), new LSMDiskComponentId(20, 24));
- List<ILSMDiskComponentId> resultSecondaryIDs = new ArrayList<>();
+ List<ILSMComponentId> secondaryComponentIDs =
+ Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29), new LSMComponentId(20, 24));
+ List<ILSMComponentId> resultSecondaryIDs = new ArrayList<>();
IndexInfo secondary = mockIndex(false, secondaryComponentIDs, resultSecondaryIDs, 0);
ILSMMergePolicy policy = mockMergePolicy(primary, secondary);
@@ -142,10 +139,11 @@
Assert.assertTrue(resultSecondaryIDs.isEmpty());
policy.diskComponentAdded(primary.getIndex(), false);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29),
- new LSMDiskComponentId(20, 24), new LSMDiskComponentId(10, 19)), resultPrimaryIDs);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29),
- new LSMDiskComponentId(20, 24)), resultSecondaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29),
+ new LSMComponentId(20, 24), new LSMComponentId(10, 19)), resultPrimaryIDs);
+ Assert.assertEquals(
+ Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29), new LSMComponentId(20, 24)),
+ resultSecondaryIDs);
} catch (HyracksDataException e) {
Assert.fail(e.getMessage());
@@ -155,17 +153,16 @@
@Test
public void testMultiPartition() {
try {
- List<ILSMDiskComponentId> componentIDs = Arrays.asList(new LSMDiskComponentId(40, 50),
- new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29), new LSMDiskComponentId(20, 24),
- new LSMDiskComponentId(10, 19));
+ List<ILSMComponentId> componentIDs = Arrays.asList(new LSMComponentId(40, 50), new LSMComponentId(30, 35),
+ new LSMComponentId(25, 29), new LSMComponentId(20, 24), new LSMComponentId(10, 19));
- List<ILSMDiskComponentId> resultPrimaryIDs = new ArrayList<>();
+ List<ILSMComponentId> resultPrimaryIDs = new ArrayList<>();
IndexInfo primary = mockIndex(true, componentIDs, resultPrimaryIDs, 0);
- List<ILSMDiskComponentId> resultSecondaryIDs = new ArrayList<>();
+ List<ILSMComponentId> resultSecondaryIDs = new ArrayList<>();
IndexInfo secondary = mockIndex(false, componentIDs, resultSecondaryIDs, 0);
- List<ILSMDiskComponentId> resultSecondaryIDs1 = new ArrayList<>();
+ List<ILSMComponentId> resultSecondaryIDs1 = new ArrayList<>();
IndexInfo secondary1 = mockIndex(false, componentIDs, resultSecondaryIDs, 1);
ILSMMergePolicy policy = mockMergePolicy(primary, secondary, secondary1);
@@ -175,10 +172,10 @@
policy.diskComponentAdded(primary.getIndex(), false);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29),
- new LSMDiskComponentId(20, 24), new LSMDiskComponentId(10, 19)), resultPrimaryIDs);
- Assert.assertEquals(Arrays.asList(new LSMDiskComponentId(30, 35), new LSMDiskComponentId(25, 29),
- new LSMDiskComponentId(20, 24), new LSMDiskComponentId(10, 19)), resultSecondaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29),
+ new LSMComponentId(20, 24), new LSMComponentId(10, 19)), resultPrimaryIDs);
+ Assert.assertEquals(Arrays.asList(new LSMComponentId(30, 35), new LSMComponentId(25, 29),
+ new LSMComponentId(20, 24), new LSMComponentId(10, 19)), resultSecondaryIDs);
Assert.assertTrue(resultSecondaryIDs1.isEmpty());
} catch (HyracksDataException e) {
Assert.fail(e.getMessage());
@@ -206,12 +203,12 @@
return policy;
}
- private IndexInfo mockIndex(boolean isPrimary, List<ILSMDiskComponentId> componentIDs,
- List<ILSMDiskComponentId> resultComponentIDs, int partition) throws HyracksDataException {
+ private IndexInfo mockIndex(boolean isPrimary, List<ILSMComponentId> componentIDs,
+ List<ILSMComponentId> resultComponentIDs, int partition) throws HyracksDataException {
List<ILSMDiskComponent> components = new ArrayList<>();
- for (ILSMDiskComponentId id : componentIDs) {
+ for (ILSMComponentId id : componentIDs) {
ILSMDiskComponent component = Mockito.mock(ILSMDiskComponent.class);
- Mockito.when(component.getComponentId()).thenReturn(id);
+ Mockito.when(component.getId()).thenReturn(id);
Mockito.when(component.getComponentSize()).thenReturn(DEFAULT_COMPONENT_SIZE);
Mockito.when(component.getState()).thenReturn(ComponentState.READABLE_UNWRITABLE);
components.add(component);
@@ -228,7 +225,7 @@
List<ILSMDiskComponent> mergedComponents = invocation.getArgumentAt(1, List.class);
mergedComponents.forEach(component -> {
try {
- resultComponentIDs.add(component.getComponentId());
+ resultComponentIDs.add(component.getId());
} catch (HyracksDataException e) {
e.printStackTrace();
}
@@ -238,8 +235,7 @@
}).when(accessor).scheduleMerge(Mockito.any(ILSMIOOperationCallback.class),
Mockito.anyListOf(ILSMDiskComponent.class));
- Mockito.when(index.createAccessor(Mockito.any(IModificationOperationCallback.class),
- Mockito.any(ISearchOperationCallback.class))).thenReturn(accessor);
+ Mockito.when(index.createAccessor(Mockito.any(IIndexAccessParameters.class))).thenReturn(accessor);
Mockito.when(index.isPrimaryIndex()).thenReturn(isPrimary);
return new IndexInfo(index, DATASET_ID, 0, partition);
diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeIOOperationCallbackTest.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeIOOperationCallbackTest.java
index 8d4cd51..f467ee8 100644
--- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeIOOperationCallbackTest.java
+++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeIOOperationCallbackTest.java
@@ -21,8 +21,9 @@
import org.apache.asterix.common.ioopcallbacks.LSMBTreeIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentIdGenerator;
import org.junit.Assert;
import org.mockito.Mockito;
@@ -34,21 +35,22 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMBTreeIOOperationCallback callback = new LSMBTreeIOOperationCallback(mockIndex);
+ LSMBTreeIOOperationCallback callback =
+ new LSMBTreeIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
@@ -58,15 +60,16 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMBTreeIOOperationCallback callback = new LSMBTreeIOOperationCallback(mockIndex);
+ LSMBTreeIOOperationCallback callback =
+ new LSMBTreeIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush first component again
//this call should fail
@@ -75,10 +78,10 @@
//the scheduleFlush request would fail this time
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackTest.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackTest.java
index ec1aba2..63c46f7 100644
--- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackTest.java
+++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMBTreeWithBuddyIOOperationCallbackTest.java
@@ -21,8 +21,9 @@
import org.apache.asterix.common.ioopcallbacks.LSMBTreeWithBuddyIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentIdGenerator;
import org.junit.Assert;
import org.mockito.Mockito;
@@ -34,21 +35,22 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMBTreeWithBuddyIOOperationCallback callback = new LSMBTreeWithBuddyIOOperationCallback(mockIndex);
+ LSMBTreeWithBuddyIOOperationCallback callback =
+ new LSMBTreeWithBuddyIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
@@ -58,15 +60,16 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMBTreeWithBuddyIOOperationCallback callback = new LSMBTreeWithBuddyIOOperationCallback(mockIndex);
+ LSMBTreeWithBuddyIOOperationCallback callback =
+ new LSMBTreeWithBuddyIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush first component again
//this call should fail
@@ -75,10 +78,10 @@
//the scheduleFlush request would fail this time
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMInvertedIndexIOOperationCallbackTest.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMInvertedIndexIOOperationCallbackTest.java
index 1711bc2..1e961d8 100644
--- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMInvertedIndexIOOperationCallbackTest.java
+++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMInvertedIndexIOOperationCallbackTest.java
@@ -21,8 +21,9 @@
import org.apache.asterix.common.ioopcallbacks.LSMInvertedIndexIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentIdGenerator;
import org.junit.Assert;
import org.mockito.Mockito;
@@ -34,21 +35,22 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMInvertedIndexIOOperationCallback callback = new LSMInvertedIndexIOOperationCallback(mockIndex);
+ LSMInvertedIndexIOOperationCallback callback =
+ new LSMInvertedIndexIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
@@ -58,15 +60,16 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMInvertedIndexIOOperationCallback callback = new LSMInvertedIndexIOOperationCallback(mockIndex);
+ LSMInvertedIndexIOOperationCallback callback =
+ new LSMInvertedIndexIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush first component again
//this call should fail
@@ -75,10 +78,10 @@
//the scheduleFlush request would fail this time
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
diff --git a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMRTreeIOOperationCallbackTest.java b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMRTreeIOOperationCallbackTest.java
index bb33f3d..618f2a3 100644
--- a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMRTreeIOOperationCallbackTest.java
+++ b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/ioopcallbacks/LSMRTreeIOOperationCallbackTest.java
@@ -21,8 +21,9 @@
import org.apache.asterix.common.ioopcallbacks.LSMRTreeIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentIdGenerator;
import org.junit.Assert;
import org.mockito.Mockito;
@@ -34,21 +35,22 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMRTreeIOOperationCallback callback = new LSMRTreeIOOperationCallback(mockIndex);
+ LSMRTreeIOOperationCallback callback =
+ new LSMRTreeIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
@@ -58,15 +60,16 @@
try {
ILSMIndex mockIndex = Mockito.mock(ILSMIndex.class);
Mockito.when(mockIndex.getNumberOfAllMemoryComponents()).thenReturn(2);
- LSMRTreeIOOperationCallback callback = new LSMRTreeIOOperationCallback(mockIndex);
+ LSMRTreeIOOperationCallback callback =
+ new LSMRTreeIOOperationCallback(mockIndex, new LSMComponentIdGenerator());
//request to flush first component
callback.updateLastLSN(1);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush second component
callback.updateLastLSN(2);
- callback.beforeOperation(LSMOperationType.FLUSH);
+ callback.beforeOperation(LSMIOOperationType.FLUSH);
//request to flush first component again
//this call should fail
@@ -75,10 +78,10 @@
//the scheduleFlush request would fail this time
Assert.assertEquals(1, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
Assert.assertEquals(2, callback.getComponentLSN(null));
- callback.afterFinalize(LSMOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
+ callback.afterFinalize(LSMIOOperationType.FLUSH, Mockito.mock(ILSMDiskComponent.class));
} catch (Exception e) {
Assert.fail();
}
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParserFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParserFactory.java
index de104d4..b1c6428 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParserFactory.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/api/IDataParserFactory.java
@@ -22,9 +22,9 @@
import java.util.List;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.external.api.IExternalDataSourceFactory.DataSourceType;
import org.apache.asterix.om.types.ARecordType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
public interface IDataParserFactory extends Serializable {
@@ -34,7 +34,6 @@
* an instance of IDataParserFactory with RECORDS data source type must implement IRecordDataParserFactory
* <T>
* an instance of IDataParserFactory with STREAM data source type must implement IStreamDataParserFactory
- * @throws AsterixException
*/
public DataSourceType getDataSourceType();
@@ -44,7 +43,7 @@
*
* @param configuration
*/
- public void configure(Map<String, String> configuration) throws AsterixException;
+ public void configure(Map<String, String> configuration) throws AlgebricksException;
/**
* Set the record type expected to be produced by parsers created by this factory
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/java/JObjectAccessors.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/java/JObjectAccessors.java
index 2b5e248..ac474a5 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/java/JObjectAccessors.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/library/java/JObjectAccessors.java
@@ -26,7 +26,6 @@
import java.util.logging.Level;
import java.util.logging.Logger;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.common.exceptions.RuntimeDataException;
import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
@@ -573,32 +572,27 @@
JList list = pointable.ordered() ? new JOrderedList(listType) : new JUnorderedList(listType);
IJObject listItem;
int index = 0;
- try {
- for (IVisitablePointable itemPointable : items) {
- IVisitablePointable itemTagPointable = itemTags.get(index);
- ATypeTag itemTypeTag = EnumDeserializer.ATYPETAGDESERIALIZER
- .deserialize(itemTagPointable.getByteArray()[itemTagPointable.getStartOffset()]);
- IAType fieldType;
- fieldType = TypeTagUtil.getBuiltinTypeByTag(itemTypeTag);
- typeInfo.reset(fieldType, itemTypeTag);
- switch (itemTypeTag) {
- case OBJECT:
- listItem = pointableVisitor.visit((ARecordVisitablePointable) itemPointable, typeInfo);
- break;
- case MULTISET:
- case ARRAY:
- listItem = pointableVisitor.visit((AListVisitablePointable) itemPointable, typeInfo);
- break;
- case ANY:
- throw new RuntimeDataException(ErrorCode.LIBRARY_JOBJECT_ACCESSOR_CANNOT_PARSE_TYPE,
- listType.getTypeTag());
- default:
- listItem = pointableVisitor.visit((AFlatValuePointable) itemPointable, typeInfo);
- }
- list.add(listItem);
+ for (IVisitablePointable itemPointable : items) {
+ IVisitablePointable itemTagPointable = itemTags.get(index);
+ ATypeTag itemTypeTag = EnumDeserializer.ATYPETAGDESERIALIZER
+ .deserialize(itemTagPointable.getByteArray()[itemTagPointable.getStartOffset()]);
+ final IAType fieldType = TypeTagUtil.getBuiltinTypeByTag(itemTypeTag);
+ typeInfo.reset(fieldType, itemTypeTag);
+ switch (itemTypeTag) {
+ case OBJECT:
+ listItem = pointableVisitor.visit((ARecordVisitablePointable) itemPointable, typeInfo);
+ break;
+ case MULTISET:
+ case ARRAY:
+ listItem = pointableVisitor.visit((AListVisitablePointable) itemPointable, typeInfo);
+ break;
+ case ANY:
+ throw new RuntimeDataException(ErrorCode.LIBRARY_JOBJECT_ACCESSOR_CANNOT_PARSE_TYPE,
+ listType.getTypeTag());
+ default:
+ listItem = pointableVisitor.visit((AFlatValuePointable) itemPointable, typeInfo);
}
- } catch (AsterixException exception) {
- throw HyracksDataException.create(exception);
+ list.add(listItem);
}
return list;
}
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/RecordWithMetadataParserFactory.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/RecordWithMetadataParserFactory.java
index c7bf447..d34b5e0 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/RecordWithMetadataParserFactory.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/parser/factory/RecordWithMetadataParserFactory.java
@@ -23,7 +23,6 @@
import java.util.List;
import java.util.Map;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.external.api.IRecordDataParser;
import org.apache.asterix.external.api.IRecordDataParserFactory;
@@ -35,14 +34,15 @@
import org.apache.asterix.external.util.ExternalDataCompatibilityUtils;
import org.apache.asterix.external.util.ExternalDataConstants;
import org.apache.asterix.om.types.ARecordType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
public class RecordWithMetadataParserFactory<I, O> implements IRecordDataParserFactory<I> {
private static final long serialVersionUID = 1L;
- private static final List<String> parserFormats = Collections
- .unmodifiableList(Arrays.asList("record-with-metadata"));
+ private static final List<String> parserFormats =
+ Collections.unmodifiableList(Arrays.asList("record-with-metadata"));
private ARecordType metaType;
private ARecordType recordType;
private IRecordDataParserFactory<O> recordParserFactory;
@@ -50,16 +50,16 @@
@SuppressWarnings("unchecked")
@Override
- public void configure(Map<String, String> configuration) throws AsterixException {
+ public void configure(Map<String, String> configuration) throws AlgebricksException {
// validate first
String recordFormat = configuration.get(ExternalDataConstants.KEY_RECORD_FORMAT);
if (recordFormat == null) {
- throw new AsterixException(ErrorCode.UNKNOWN_RECORD_FORMAT_FOR_META_PARSER,
+ throw AlgebricksException.create(ErrorCode.UNKNOWN_RECORD_FORMAT_FOR_META_PARSER,
ExternalDataConstants.KEY_FORMAT);
}
String format = configuration.get(ExternalDataConstants.KEY_FORMAT);
if (format == null) {
- throw new AsterixException(ErrorCode.UNKNOWN_RECORD_FORMAT_FOR_META_PARSER,
+ throw AlgebricksException.create(ErrorCode.UNKNOWN_RECORD_FORMAT_FOR_META_PARSER,
ExternalDataConstants.KEY_FORMAT);
}
// Create Parser Factory
diff --git a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
index f42c030..e2fa6db 100644
--- a/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
+++ b/asterixdb/asterix-external-data/src/main/java/org/apache/asterix/external/util/FeedConstants.java
@@ -18,13 +18,12 @@
*/
package org.apache.asterix.external.util;
-import org.apache.asterix.common.functions.FunctionConstants;
-import org.apache.asterix.common.functions.FunctionSignature;
+import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
public class FeedConstants {
- public static final FunctionSignature FEED_COLLECT_FUN_SIGNATURE =
- new FunctionSignature(FunctionConstants.ASTERIX_NS, "feed_collect", 6);
+ public static final FunctionIdentifier FEED_COLLECT_FUN = BuiltinFunctions.FEED_COLLECT;
public final static String FEEDS_METADATA_DV = "feeds_metadata";
public final static String FAILED_TUPLE_DATASET = "failed_tuple";
diff --git a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/factory/TestRecordWithPKParserFactory.java b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/factory/TestRecordWithPKParserFactory.java
index 7284979..42f1f99 100644
--- a/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/factory/TestRecordWithPKParserFactory.java
+++ b/asterixdb/asterix-external-data/src/test/java/org/apache/asterix/external/parser/factory/TestRecordWithPKParserFactory.java
@@ -23,7 +23,6 @@
import java.util.Map;
import java.util.TreeMap;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.external.api.IRecordDataParser;
import org.apache.asterix.external.api.IRecordDataParserFactory;
import org.apache.asterix.external.input.record.RecordWithPK;
@@ -32,6 +31,7 @@
import org.apache.asterix.external.util.ExternalDataConstants;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -49,7 +49,7 @@
private int[][] pkIndexes;
@Override
- public void configure(Map<String, String> configuration) throws AsterixException {
+ public void configure(Map<String, String> configuration) throws AlgebricksException {
TreeMap<String, String> parserConf = new TreeMap<String, String>();
format = configuration.get(ExternalDataConstants.KEY_RECORD_FORMAT);
parserFormats.add(format);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.2.ddl.aql
deleted file mode 100644
index 9d4c55d..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.2.ddl.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.3.update.aql
deleted file mode 100644
index ab07679..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.3.update.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.4.txneu.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.4.txneu.aql
deleted file mode 100644
index 2c8886e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.4.txneu.aql
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id % 28000,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.5.txnqbc.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.5.txnqbc.aql
deleted file mode 100644
index ff244d9..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.5.txnqbc.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.6.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.7.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.8.txnqar.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.8.txnqar.aql
deleted file mode 100644
index ff244d9..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.8.txnqar.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.9.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.9.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_index_only/primary_index_only.9.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.2.ddl.aql
deleted file mode 100644
index df75adf..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.2.ddl.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float,
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float,
-
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
-/* Create default secondary index on dataset clean Fragile */
-create index cfSidIdx on Fragile(sid);
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql
deleted file mode 100644
index ce01110..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.3.update.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.4.txneu.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.4.txneu.aql
deleted file mode 100644
index 261e7b9..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.4.txneu.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id % 28000,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR,
- "text": $t.text,
- "location": $t.location,
- "text2": $t.text2
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.5.txnqbc.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.5.txnqbc.aql
deleted file mode 100644
index 595acfb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.5.txnqbc.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Otc 15 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile where $x.sid=1 return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.6.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.7.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.8.txnqar.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.8.txnqar.aql
deleted file mode 100644
index 714fcbc..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.8.txnqar.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile where $x.sid=1 return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.9.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.9.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_default_secondary_index/primary_plus_default_secondary_index.9.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.2.ddl.aql
deleted file mode 100644
index 107500e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.2.ddl.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float,
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float,
-
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
-/* Create keyword secondary index on dataset clean Fragile */
-create index cfText on Fragile(text) type keyword;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql
deleted file mode 100644
index 66adcef..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.3.update.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.4.txneu.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.4.txneu.aql
deleted file mode 100644
index 7c1c623..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.4.txneu.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id % 28000,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR,
- "text": $t.text,
- "location": $t.location,
- "text2": $t.text2
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.5.txnqbc.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.5.txnqbc.aql
deleted file mode 100644
index 4d48e81..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.5.txnqbc.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse recovery;
-
-for $x in dataset Fragile
-where word-tokens($x.text) ~= word-tokens(" 1 20130417 1")
-return $x.text;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.6.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.7.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.8.txnqar.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.8.txnqar.aql
deleted file mode 100644
index 4d48e81..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.8.txnqar.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse recovery;
-
-for $x in dataset Fragile
-where word-tokens($x.text) ~= word-tokens(" 1 20130417 1")
-return $x.text;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.9.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.9.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_keyword_secondary_index/primary_plus_keyword_secondary_index.9.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.2.ddl.aql
deleted file mode 100644
index 071f4e0..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.2.ddl.aql
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float,
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float,
-
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
-
-create index cfText on Fragile(text) type keyword;
-
-create index cfSidIdx on Fragile(sid);
-
-create index cfText2Ix on Fragile(text2) type ngram(3);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql
deleted file mode 100644
index 66adcef..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.3.update.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.4.txneu.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.4.txneu.aql
deleted file mode 100644
index 7c1c623..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.4.txneu.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id % 28000,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR,
- "text": $t.text,
- "location": $t.location,
- "text2": $t.text2
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.5.txnqbc.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.5.txnqbc.aql
deleted file mode 100644
index ca06f14..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.5.txnqbc.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Otc 15 2013
- */
-
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile
-where contains($x.text2, "location") return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.6.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.7.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.8.txnqar.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.8.txnqar.aql
deleted file mode 100644
index 4738d05..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.8.txnqar.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile
-where contains($x.text2, "location") return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.9.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.9.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_multiple_secondary_indices/primary_plus_multiple_secondary_indices.9.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.2.ddl.aql
deleted file mode 100644
index 4d215d3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.2.ddl.aql
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float,
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float,
-
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
-/* Create default secondary index on dataset clean Fragile */
-create index cfText2Ix on Fragile(text2) type ngram(3);
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql
deleted file mode 100644
index ce01110..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.3.update.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.4.txneu.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.4.txneu.aql
deleted file mode 100644
index 261e7b9..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.4.txneu.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id % 28000,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR,
- "text": $t.text,
- "location": $t.location,
- "text2": $t.text2
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.5.txnqbc.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.5.txnqbc.aql
deleted file mode 100644
index dd499be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.5.txnqbc.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Otc 15 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile
-where contains($x.text2, "location") return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.6.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.7.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.8.txnqar.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.8.txnqar.aql
deleted file mode 100644
index 07b177d..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.8.txnqar.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_default_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile
-where contains($x.text2, "location") return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.9.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.9.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_ngram_index/primary_plus_ngram_index.9.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.2.ddl.aql
deleted file mode 100644
index 95a21b4..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.2.ddl.aql
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float,
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float,
-
- /* new string field and location field*/
- text: string,
- location: point,
- text2: string
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
-
-/* Create rtree secondary index on dataset clean Fragile */
-create index cfLocation on Fragile(location) type rtree;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql
deleted file mode 100644
index 66adcef..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.3.update.aql
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_02.adm"),("format"="adm")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.4.txneu.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.4.txneu.aql
deleted file mode 100644
index 7c1c623..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.4.txneu.aql
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_plus_keyword_secondary_index.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : Oct 15 2013
- */
-
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id % 28000,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR,
- "text": $t.text,
- "location": $t.location,
- "text2": $t.text2
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql
deleted file mode 100644
index dc20c89..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.5.txnqbc.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse recovery;
-
-count (for $x in dataset Fragile where
-spatial-intersect($x.location, create-polygon([0.0,0.0, 2.0,2.0, 0.0,2.0, 2.0,0.0]))
-return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.6.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.7.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql
deleted file mode 100644
index dc20c89..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.8.txnqar.aql
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse recovery;
-
-count (for $x in dataset Fragile where
-spatial-intersect($x.location, create-polygon([0.0,0.0, 2.0,2.0, 0.0,2.0, 2.0,0.0]))
-return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.9.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.9.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recover_after_abort/temp_primary_plus_rtree_index/primary_plus_rtree_index.9.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.2.ddl.aql
deleted file mode 100644
index fc78710..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.2.ddl.aql
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : dataverse_recovery
- * Description :
- * Expected Result :
- * Date :
- */
-
-drop dataverse SampleDV if exists;
-create dataverse SampleDV;
-
-use dataverse SampleDV;
-
-create type SampleType as open {
- id: int32,
- text: string
-}
-
-create temporary dataset SampleDS(SampleType)
-primary key id;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.3.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.3.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.3.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.4.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.4.script.aql
deleted file mode 100644
index d844d13..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.4.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.5.errddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.5.errddl.aql
deleted file mode 100644
index bbd8044..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.5.errddl.aql
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse SampleDV;
-drop dataset SampleDS;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.6.script.aql
deleted file mode 100644
index f43dec7..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_dataset_recovery/dataset_recovery.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.2.ddl.aql
deleted file mode 100644
index 9d4c55d..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.2.ddl.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.3.update.aql
deleted file mode 100644
index ab07679..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.3.update.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.4.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.4.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.4.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.5.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.5.script.aql
deleted file mode 100644
index d844d13..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.5.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.7.query.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.7.query.aql
deleted file mode 100644
index a290f58..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.7.query.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile_raw return $x);
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.8.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.8.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.8.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.2.ddl.aql
deleted file mode 100644
index 9d4c55d..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.2.ddl.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.3.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.3.update.aql
deleted file mode 100644
index ab07679..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.3.update.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.4.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.4.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.4.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.5.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.5.script.aql
deleted file mode 100644
index d844d13..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.5.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.6.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.6.update.aql
deleted file mode 100644
index c4e167a..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.6.update.aql
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse recovery;
-
-/* Load Fragile data from raw dataset into cleaned dataset */
-insert into dataset Fragile (
- for $t in dataset Fragile_raw
- return {
- "row_id": $t.row_id,
- "sid": $t.sid,
- "date": date($t.date),
- "day": $t.day,
- "time": parse-time($t.time, "h:m:s"),
- "bpm": $t.bpm,
- "RR": $t.RR
- }
-);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.7.query.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.7.query.aql
deleted file mode 100644
index c193c29..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.7.query.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile return $x);
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.8.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.8.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.8.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.2.ddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.2.ddl.aql
deleted file mode 100644
index 9d4c55d..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.2.ddl.aql
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-drop dataverse recovery if exists;
-create dataverse recovery;
-use dataverse recovery;
-
-/* For raw Fragile data */
-create type FragileTypeRaw as closed {
- row_id: int32,
- sid: int32,
- date: string,
- day: int32,
- time: string,
- bpm: int32,
- RR: float
-};
-
-/* For cleaned Fragile data */
-create type FragileType as closed {
- row_id: int32,
- sid: int32,
- date: date,
- day: int32,
- time: time,
- bpm: int32,
- RR: float
-};
-
-/* Create dataset for loading raw Fragile data */
-create temporary dataset Fragile_raw (FragileTypeRaw)
-primary key row_id;
-
-/* Create dataset for cleaned Fragile data */
-create temporary dataset Fragile (FragileType)
-primary key row_id;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.3.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.3.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.3.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.4.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.4.script.aql
deleted file mode 100644
index 7087cd3..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.4.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.5.update.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.5.update.aql
deleted file mode 100644
index ab07679..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.5.update.aql
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-load dataset Fragile_raw using localfs
-(("path"="asterix_nc1://../../../../../../asterix-app/data/csv/fragile_01.csv"),("format"="delimited-text"),("delimiter"=",")) pre-sorted;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.6.query.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.6.query.aql
deleted file mode 100644
index ebac011..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.6.query.aql
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-/*
- * Test case Name : primary_index_only.aql
- * Description : Check that abort from duplicate key exception works and crash recovery works after the abort.
- * Expected Result : Success
- * Date : September 25 2013
- */
-
-use dataverse recovery;
-
-count (for $x in dataset Fragile_raw return $x);
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.7.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.7.script.aql
deleted file mode 100644
index 40df6fb..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_load_after_recovery/load_after_recovery.7.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.1.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.1.script.aql
deleted file mode 100644
index 7d441cd..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.1.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-create_and_start.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.3.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.3.script.aql
deleted file mode 100644
index 4583455..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.3.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-kill_cc_and_nc.sh
\ No newline at end of file
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.4.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.4.script.aql
deleted file mode 100644
index d844d13..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.4.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_start.sh
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.5.errddl.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.5.errddl.aql
deleted file mode 100644
index bcc8223..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.5.errddl.aql
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-use dataverse SampleDV;
-drop index SampleDS.SampleDSix;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.6.script.aql b/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.6.script.aql
deleted file mode 100644
index f43dec7..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.6.script.aql
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-stop_and_delete.sh
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.1.adm b/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.1.adm
deleted file mode 100644
index b1646d9..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_delete_after_recovery/delete_after_recovery.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-129088
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.1.adm b/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.1.adm
deleted file mode 100644
index 78b4996..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_insert_after_recovery/insert_after_recovery.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-258176
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_load_after_recovery/load_after_recovery.1.adm b/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_load_after_recovery/load_after_recovery.1.adm
deleted file mode 100644
index 78b4996..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/results/recovery_ddl/temp_load_after_recovery/load_after_recovery.1.adm
+++ /dev/null
@@ -1 +0,0 @@
-258176
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_index_only/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_default_secondary_index/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_keyword_secondary_index/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_multiple_secondary_indices/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_ngram_index/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recover_after_abort/temp_primary_plus_rtree_index/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_dataset_recovery/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_delete_after_recovery/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_insert_after_recovery/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_load_after_recovery/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/create_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/create_and_start.sh
deleted file mode 100755
index 789914b..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/create_and_start.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix create -n asterix -c $MANAGIX_HOME/clusters/local/local.xml;
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/kill_cc_and_nc.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/kill_cc_and_nc.sh
deleted file mode 100755
index 4b876be..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/kill_cc_and_nc.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-ps -ef | awk '/java.*org\.apache\.hyracks\.control\.[cn]c\.[CN]CDriver/ {print $2}' | xargs -n 1 kill -9
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/stop_and_delete.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/stop_and_delete.sh
deleted file mode 100755
index eb1c01e..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/stop_and_delete.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix delete -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/stop_and_start.sh b/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/stop_and_start.sh
deleted file mode 100755
index 2fb80ce..0000000
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/scripts/recovery_ddl/temp_secondary_index_recovery/stop_and_start.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-$MANAGIX_HOME/bin/managix stop -n asterix;
-$MANAGIX_HOME/bin/managix start -n asterix;
-
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/testsuite.xml b/asterixdb/asterix-installer/src/test/resources/transactionts/testsuite.xml
index bd68075..38179b2 100644
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/testsuite.xml
+++ b/asterixdb/asterix-installer/src/test/resources/transactionts/testsuite.xml
@@ -158,41 +158,6 @@
</test-case>
<test-case FilePath="recover_after_abort">
- <compilation-unit name="temp_primary_index_only">
- <output-dir compare="Text">primary_index_only</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recover_after_abort">
- <compilation-unit name="temp_primary_plus_default_secondary_index">
- <output-dir compare="Text">primary_plus_default_secondary_index</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recover_after_abort">
- <compilation-unit name="temp_primary_plus_rtree_index">
- <output-dir compare="Text">primary_plus_rtree_index</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recover_after_abort">
- <compilation-unit name="temp_primary_plus_keyword_secondary_index">
- <output-dir compare="Text">primary_plus_keyword_secondary_index</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException: Could not find dataset Fragile in dataverse recovery</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recover_after_abort">
- <compilation-unit name="temp_primary_plus_ngram_index">
- <output-dir compare="Text">primary_plus_ngram_index</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recover_after_abort">
<compilation-unit name="primary_plus_multiple_secondary_indices"><!-- The only exception here is during the kill command which is in a different JVM, hence not caught -->
<output-dir compare="Text">primary_plus_multiple_secondary_indices</output-dir>
<!-- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error> -->
@@ -249,45 +214,6 @@
<output-dir compare="Text">function_recovery</output-dir>
</compilation-unit>
</test-case>
-
- <test-case FilePath="recovery_ddl">
- <compilation-unit name="temp_dataset_recovery">
- <output-dir compare="Text">dataset_recovery</output-dir>
- <!-- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error> -->
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recovery_ddl">
- <compilation-unit name="temp_delete_after_recovery">
- <output-dir compare="Text">delete_after_recovery</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException: Cannot find dataset Fragile_raw in dataverse recovery</expected-error>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException: Could not find dataset Fragile_raw in dataverse recovery</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recovery_ddl">
- <compilation-unit name="temp_insert_after_recovery">
- <output-dir compare="Text">insert_after_recovery</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException: Could not find dataset Fragile in dataverse recovery</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recovery_ddl">
- <compilation-unit name="temp_load_after_recovery">
- <output-dir compare="Text">load_after_recovery</output-dir>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error>
- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException: Could not find dataset Fragile_raw in dataverse recovery</expected-error>
- </compilation-unit>
- </test-case>
-
- <test-case FilePath="recovery_ddl">
- <compilation-unit name="temp_secondary_index_recovery">
- <output-dir compare="Text">secondary_index_recovery</output-dir>
- <!-- <expected-error>org.apache.hyracks.algebricks.common.exceptions.AlgebricksException</expected-error> -->
- </compilation-unit>
- </test-case>
-
</test-group>
</test-suite>
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/FLWOGRExpression.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/FLWOGRExpression.java
index 10143f2..54fd8cf 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/FLWOGRExpression.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/FLWOGRExpression.java
@@ -22,12 +22,13 @@
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.aql.visitor.base.IAQLVisitor;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Clause;
import org.apache.asterix.lang.common.base.Clause.ClauseType;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
-public class FLWOGRExpression implements Expression {
+public class FLWOGRExpression extends AbstractExpression {
private List<Clause> clauseList;
private Expression returnExpr;
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/UnionExpr.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/UnionExpr.java
index 133cb46..bb29762 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/UnionExpr.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/expression/UnionExpr.java
@@ -23,15 +23,16 @@
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.aql.visitor.base.IAQLVisitor;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
-public class UnionExpr implements Expression {
+public class UnionExpr extends AbstractExpression {
private List<Expression> exprs;
public UnionExpr() {
- exprs = new ArrayList<Expression>();
+ exprs = new ArrayList<>();
}
public UnionExpr(List<Expression> exprs) {
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLAstPrintVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLAstPrintVisitor.java
index 1f76f75..0c34b83 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLAstPrintVisitor.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLAstPrintVisitor.java
@@ -32,16 +32,8 @@
class AQLAstPrintVisitor extends QueryPrintVisitor implements IAQLVisitor<Void, Integer> {
- private final PrintWriter out;
-
- public AQLAstPrintVisitor() {
- super();
- out = new PrintWriter(System.out);
- }
-
public AQLAstPrintVisitor(PrintWriter out) {
super(out);
- this.out = out;
}
@Override
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLFormatPrintVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLFormatPrintVisitor.java
index a12f089..eea398f 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLFormatPrintVisitor.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLFormatPrintVisitor.java
@@ -31,16 +31,8 @@
public class AQLFormatPrintVisitor extends FormatPrintVisitor implements IAQLVisitor<Void, Integer> {
- private final PrintWriter out;
-
- public AQLFormatPrintVisitor() {
- super();
- out = new PrintWriter(System.out);
- }
-
public AQLFormatPrintVisitor(PrintWriter out) {
super(out);
- this.out = out;
}
@Override
@@ -80,5 +72,4 @@
out.println();
return null;
}
-
}
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
index 481dea7..8d84dbc 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AQLToSQLPPPrintVisitor.java
@@ -55,6 +55,7 @@
import org.apache.asterix.lang.common.statement.InsertStatement;
import org.apache.asterix.lang.common.statement.Query;
import org.apache.asterix.lang.common.struct.Identifier;
+import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.common.struct.VarIdentifier;
import org.apache.asterix.lang.common.visitor.FormatPrintVisitor;
import org.apache.hyracks.algebricks.common.utils.Pair;
@@ -584,7 +585,7 @@
newWhereExpr.setExprList(expressions);
newWhereExpr.setCurrentop(true);
for (int operatorIndex = 0; operatorIndex < expressions.size(); ++operatorIndex) {
- newWhereExpr.addOperator("and");
+ newWhereExpr.addOperator(OperatorType.AND);
}
results.add(new WhereClause(newWhereExpr));
} else {
diff --git a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
index 57370c5..e90f9a9 100644
--- a/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
+++ b/asterixdb/asterix-lang-aql/src/main/java/org/apache/asterix/lang/aql/visitor/AqlDeleteRewriteVisitor.java
@@ -36,6 +36,7 @@
import org.apache.asterix.lang.common.statement.DeleteStatement;
import org.apache.asterix.lang.common.statement.Query;
import org.apache.asterix.lang.common.struct.Identifier;
+import org.apache.asterix.om.functions.BuiltinFunctions;
public class AqlDeleteRewriteVisitor extends AbstractAqlAstVisitor<Void, Void> {
@@ -48,8 +49,7 @@
: dataverseName.getValue() + "." + datasetName.getValue();
LiteralExpr argumentLiteral = new LiteralExpr(new StringLiteral(arg));
arguments.add(argumentLiteral);
- CallExpr callExpression =
- new CallExpr(new FunctionSignature(FunctionConstants.ASTERIX_NS, "dataset", 1), arguments);
+ CallExpr callExpression = new CallExpr(new FunctionSignature(BuiltinFunctions.DATASET), arguments);
List<Clause> clauseList = new ArrayList<>();
VariableExpr var = deleteStmt.getVariableExpr();
diff --git a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
index 0cc6789..59ed8ae 100644
--- a/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
+++ b/asterixdb/asterix-lang-aql/src/main/javacc/AQL.jj
@@ -448,7 +448,6 @@
DatasetDecl dsetDecl = null;
boolean autogenerated = false;
String compactionPolicy = null;
- boolean temp = false;
Pair<Integer, List<String>> filterField = null;
Pair<Identifier,Identifier> metaTypeComponents = new Pair<Identifier, Identifier>(null, null);
}
@@ -480,10 +479,7 @@
ifNotExists);
}
- | (<INTERNAL> | <TEMPORARY> {
- temp = token.image.toLowerCase().equals("temporary");
- }
- )?
+ | ( <INTERNAL> )?
<DATASET> nameComponents = QualifiedName()
<LEFTPAREN> typeComponents = TypeName() <RIGHTPAREN>
(
@@ -511,8 +507,7 @@
InternalDetailsDecl idd = new InternalDetailsDecl(primaryKeyFields.second,
primaryKeyFields.first,
autogenerated,
- filterField == null? null : filterField.second,
- temp);
+ filterField == null? null : filterField.second);
dsetDecl = new DatasetDecl(nameComponents.first,
nameComponents.second,
typeComponents.first,
@@ -2729,7 +2724,7 @@
| <START: "start">
| <STOP: "stop">
| <SOME : "some">
- | <TEMPORARY : "temporary">
+ | <TEMPORARY : "temporary"> // intentionally not used but reserved for future usage
| <THEN : "then">
| <TO : "to">
| <TYPE : "type">
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/AbstractExpression.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/AbstractExpression.java
index 536b195..44a05ef 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/AbstractExpression.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/AbstractExpression.java
@@ -28,7 +28,7 @@
public void addHint(IExpressionAnnotation hint) {
if (hints == null) {
- hints = new ArrayList<IExpressionAnnotation>();
+ hints = new ArrayList<>();
}
hints.add(hint);
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Expression.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Expression.java
index 7da34fe..3afff76 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Expression.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/base/Expression.java
@@ -19,9 +19,9 @@
package org.apache.asterix.lang.common.base;
public interface Expression extends ILangExpression {
- public abstract Kind getKind();
+ Kind getKind();
- public enum Kind {
+ enum Kind {
LITERAL_EXPRESSION,
FLWOGR_EXPRESSION,
IF_EXPRESSION,
@@ -38,8 +38,6 @@
UNION_EXPRESSION,
SELECT_EXPRESSION,
PRIMARY_EXPRESSION,
- INDEPENDENT_SUBQUERY,
CASE_EXPRESSION
}
-
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java
index 2b7b748..eb35c9c 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/AbstractAccessor.java
@@ -18,10 +18,11 @@
*/
package org.apache.asterix.lang.common.expression;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.commons.lang.ObjectUtils;
-public abstract class AbstractAccessor implements Expression {
+public abstract class AbstractAccessor extends AbstractExpression {
protected Expression expr;
public AbstractAccessor(Expression expr) {
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
index 30b7297..ebdaac7 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/CallExpr.java
@@ -30,7 +30,6 @@
public class CallExpr extends AbstractExpression {
private FunctionSignature functionSignature;
private List<Expression> exprList;
- private boolean isBuiltin;
public CallExpr(FunctionSignature functionSignature, List<Expression> exprList) {
this.functionSignature = functionSignature;
@@ -45,10 +44,6 @@
return exprList;
}
- public boolean isBuiltin() {
- return isBuiltin;
- }
-
@Override
public Kind getKind() {
return Kind.CALL_EXPRESSION;
@@ -74,7 +69,7 @@
@Override
public int hashCode() {
- return ObjectUtils.hashCodeMulti(exprList, functionSignature, isBuiltin);
+ return ObjectUtils.hashCodeMulti(exprList, functionSignature);
}
@Override
@@ -87,6 +82,6 @@
}
CallExpr target = (CallExpr) object;
return ObjectUtils.equals(exprList, target.exprList)
- && ObjectUtils.equals(functionSignature, target.functionSignature) && isBuiltin == target.isBuiltin;
+ && ObjectUtils.equals(functionSignature, target.functionSignature);
}
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/IfExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/IfExpr.java
index 26b9c83..c833109 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/IfExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/IfExpr.java
@@ -19,11 +19,12 @@
package org.apache.asterix.lang.common.expression;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class IfExpr implements Expression {
+public class IfExpr extends AbstractExpression {
private Expression condExpr;
private Expression thenExpr;
private Expression elseExpr;
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/ListConstructor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/ListConstructor.java
index 9a6d3f6..2a527d5 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/ListConstructor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/ListConstructor.java
@@ -21,11 +21,12 @@
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class ListConstructor implements Expression {
+public class ListConstructor extends AbstractExpression {
private List<Expression> exprList;
private Type type;
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/LiteralExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/LiteralExpr.java
index 600a82c..095f098 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/LiteralExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/LiteralExpr.java
@@ -19,12 +19,12 @@
package org.apache.asterix.lang.common.expression;
import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Literal;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class LiteralExpr implements Expression {
+public class LiteralExpr extends AbstractExpression {
private Literal value;
public LiteralExpr() {
@@ -69,5 +69,4 @@
LiteralExpr target = (LiteralExpr) object;
return ObjectUtils.equals(value, target.value);
}
-
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
index 954f715..b35aa91 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/OperatorExpr.java
@@ -20,7 +20,6 @@
import java.util.ArrayList;
import java.util.List;
-import java.util.Optional;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.lang.common.base.AbstractExpression;
@@ -33,7 +32,7 @@
private List<Expression> exprList;
private List<OperatorType> opList;
private List<Integer> exprBroadcastIdx;
- private boolean currentop = false;
+ private boolean currentop;
public OperatorExpr() {
super();
@@ -92,12 +91,18 @@
}
public void addOperator(String strOp) throws CompilationException {
- Optional<OperatorType> op = OperatorType.fromSymbol(strOp);
- if (op.isPresent()) {
- opList.add(op.get());
- } else {
+ OperatorType op = OperatorType.fromSymbol(strOp);
+ if (op == null) {
throw new CompilationException("Unsupported operator: " + strOp);
}
+ addOperator(op);
+ }
+
+ public void addOperator(OperatorType op) throws CompilationException {
+ if (op == null) {
+ throw new NullPointerException();
+ }
+ opList.add(op);
}
@Override
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/QuantifiedExpression.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/QuantifiedExpression.java
index 40322d7..2a42da4f 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/QuantifiedExpression.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/QuantifiedExpression.java
@@ -21,12 +21,13 @@
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.struct.QuantifiedPair;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class QuantifiedExpression implements Expression {
+public class QuantifiedExpression extends AbstractExpression {
private List<QuantifiedPair> quantifiedList;
private Expression satisfiesExpr;
private Quantifier quantifier;
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/RecordConstructor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/RecordConstructor.java
index 6b17461..1aa8ff1 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/RecordConstructor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/RecordConstructor.java
@@ -21,11 +21,11 @@
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class RecordConstructor implements Expression {
+public class RecordConstructor extends AbstractExpression {
private List<FieldBinding> fbList;
public RecordConstructor() {
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/UnaryExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/UnaryExpr.java
index 99197c6..f341601 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/UnaryExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/UnaryExpr.java
@@ -21,12 +21,13 @@
import java.util.Optional;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.struct.UnaryExprType;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class UnaryExpr implements Expression {
+public class UnaryExpr extends AbstractExpression {
private UnaryExprType unaryExprType;
private Expression expr;
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/VariableExpr.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/VariableExpr.java
index 8fcd2ad..e55e40d 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/VariableExpr.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/expression/VariableExpr.java
@@ -19,12 +19,12 @@
package org.apache.asterix.lang.common.expression;
import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.struct.VarIdentifier;
import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class VariableExpr implements Expression {
+public class VariableExpr extends AbstractExpression {
private VarIdentifier var;
private boolean isNewVar;
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFunctionStatement.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFunctionStatement.java
index 6d74957..84d66ce 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFunctionStatement.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/CreateFunctionStatement.java
@@ -34,10 +34,6 @@
private final boolean ifNotExists;
private final List<String> paramList;
- public FunctionSignature getaAterixFunction() {
- return signature;
- }
-
public String getFunctionBody() {
return functionBody;
}
@@ -66,7 +62,7 @@
return paramList;
}
- public FunctionSignature getSignature() {
+ public FunctionSignature getFunctionSignature() {
return signature;
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/ExternalDetailsDecl.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/ExternalDetailsDecl.java
index b15579c..db599c4 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/ExternalDetailsDecl.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/ExternalDetailsDecl.java
@@ -40,9 +40,4 @@
return properties;
}
- @Override
- public boolean isTemp() {
- return false;
- }
-
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/IDatasetDetailsDecl.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/IDatasetDetailsDecl.java
index da27f17..7f48c32 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/IDatasetDetailsDecl.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/IDatasetDetailsDecl.java
@@ -20,6 +20,4 @@
public interface IDatasetDetailsDecl {
- public boolean isTemp();
-
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/InternalDetailsDecl.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/InternalDetailsDecl.java
index 41d97a8..f312ddd 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/InternalDetailsDecl.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/statement/InternalDetailsDecl.java
@@ -24,16 +24,14 @@
private final List<List<String>> partitioningExprs;
private final List<Integer> keySourceIndicators;
private final boolean autogenerated;
- private final boolean temp;
private final List<String> filterField;
public InternalDetailsDecl(List<List<String>> partitioningExpr, List<Integer> keySourceIndicators,
- boolean autogenerated, List<String> filterField, boolean temp) {
+ boolean autogenerated, List<String> filterField) {
this.partitioningExprs = partitioningExpr;
this.keySourceIndicators = keySourceIndicators;
this.autogenerated = autogenerated;
this.filterField = filterField;
- this.temp = temp;
}
public List<List<String>> getPartitioningExprs() {
@@ -48,11 +46,6 @@
return autogenerated;
}
- @Override
- public boolean isTemp() {
- return temp;
- }
-
public List<String> getFilterField() {
return filterField;
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
index f00d3ca..e11f169 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/struct/OperatorType.java
@@ -18,9 +18,6 @@
*/
package org.apache.asterix.lang.common.struct;
-import java.util.Arrays;
-import java.util.Optional;
-
public enum OperatorType {
OR("or"),
AND("and"),
@@ -47,6 +44,8 @@
BETWEEN("between"),
NOT_BETWEEN("not_between");
+ private static final OperatorType[] VALUES = values();
+
private final String symbol;
OperatorType(String s) {
@@ -58,7 +57,12 @@
return symbol;
}
- public static Optional<OperatorType> fromSymbol(String symbol) {
- return Arrays.stream(OperatorType.values()).filter(o -> o.symbol.equals(symbol)).findFirst();
+ public static OperatorType fromSymbol(String symbol) {
+ for (OperatorType opType : VALUES) {
+ if (opType.symbol.equals(symbol)) {
+ return opType;
+ }
+ }
+ return null;
}
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
index 8d8ab73..1ca9316 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/util/FunctionUtil.java
@@ -33,6 +33,8 @@
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Function;
import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.core.algebra.functions.AlgebricksBuiltinFunctions;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.algebricks.core.algebra.functions.IFunctionInfo;
@@ -64,14 +66,16 @@
}
/**
- * Retrieve stored functions (from CREATE FUNCTION statements) that have been used in an expression.
+ * Retrieve stored functions (from CREATE FUNCTION statements) that have been
+ * used in an expression.
*
* @param metadataProvider,
* the metadata provider
* @param expression,
* the expression for analysis
* @param declaredFunctions,
- * a set of declared functions in the query, which can potentially override stored functions.
+ * a set of declared functions in the query, which can potentially
+ * override stored functions.
* @param functionCollector,
* for collecting function calls in the <code>expression</code>
* @param functionParser,
@@ -84,8 +88,8 @@
Expression expression, List<FunctionSignature> declaredFunctions, List<FunctionDecl> inputFunctionDecls,
IFunctionCollector functionCollector, IFunctionParser functionParser,
IFunctionNormalizer functionNormalizer) throws CompilationException {
- List<FunctionDecl> functionDecls = inputFunctionDecls == null ? new ArrayList<>()
- : new ArrayList<>(inputFunctionDecls);
+ List<FunctionDecl> functionDecls =
+ inputFunctionDecls == null ? new ArrayList<>() : new ArrayList<>(inputFunctionDecls);
if (expression == null) {
return functionDecls;
}
@@ -101,12 +105,22 @@
}
String namespace = signature.getNamespace();
// Checks the existence of the referred dataverse.
- if (metadataProvider.findDataverse(namespace) == null
- && !namespace.equals(FunctionConstants.ASTERIX_NS)) {
- throw new CompilationException("In function call \"" + namespace + "." + signature.getName()
- + "(...)\", the dataverse \"" + namespace + "\" cannot be found!");
+ try {
+ if (!namespace.equals(FunctionConstants.ASTERIX_NS)
+ && !namespace.equals(AlgebricksBuiltinFunctions.ALGEBRICKS_NS)
+ && metadataProvider.findDataverse(namespace) == null) {
+ throw new CompilationException("In function call \"" + namespace + "." + signature.getName()
+ + "(...)\", the dataverse \"" + namespace + "\" cannot be found!");
+ }
+ } catch (AlgebricksException e) {
+ throw new CompilationException(e);
}
- Function function = lookupUserDefinedFunctionDecl(metadataProvider.getMetadataTxnContext(), signature);
+ Function function;
+ try {
+ function = lookupUserDefinedFunctionDecl(metadataProvider.getMetadataTxnContext(), signature);
+ } catch (AlgebricksException e) {
+ throw new CompilationException(e);
+ }
if (function == null) {
FunctionSignature normalizedSignature = functionNormalizer == null ? signature
: functionNormalizer.normalizeBuiltinFunctionSignature(signature);
@@ -142,7 +156,7 @@
}
private static Function lookupUserDefinedFunctionDecl(MetadataTransactionContext mdTxnCtx,
- FunctionSignature signature) throws CompilationException {
+ FunctionSignature signature) throws AlgebricksException {
if (signature.getNamespace() == null) {
return null;
}
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java
index a2e7341..21a4b76 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/FormatPrintVisitor.java
@@ -108,17 +108,13 @@
private final static String CREATE = "create ";
private final static String FEED = " feed ";
private final static String DEFAULT_DATAVERSE_FORMAT = "org.apache.asterix.runtime.formats.NonTaggedDataFormat";
- private final PrintWriter out;
+ protected final PrintWriter out;
protected Set<Character> validIdentifierChars = new HashSet<Character>();
protected Set<Character> validIdentifierStartChars = new HashSet<Character>();
protected String dataverseSymbol = " dataverse ";
protected String datasetSymbol = " dataset ";
protected String assignSymbol = ":=";
- public FormatPrintVisitor() {
- this(new PrintWriter(System.out));
- }
-
public FormatPrintVisitor(PrintWriter out) {
this.out = out;
for (char ch = 'a'; ch <= 'z'; ++ch) {
@@ -137,7 +133,7 @@
}
protected String skip(int step) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < step; i++) {
sb.append(" ");
}
@@ -190,9 +186,9 @@
if (lc.getType().equals(ListConstructor.Type.ORDERED_LIST_CONSTRUCTOR)) {
ordered = true;
}
- out.print(ordered == true ? "[" : "{{");
+ out.print(ordered ? "[" : "{{");
printDelimitedExpressions(lc.getExprList(), COMMA, step + 2);
- out.print(ordered == true ? "]" : "}}");
+ out.print(ordered ? "]" : "}}");
return null;
}
@@ -232,7 +228,7 @@
out.print("(");
exprList.get(0).accept(this, step + 1);
for (int i = 1; i < exprList.size(); i++) {
- OperatorType opType = opList.get(i - 1);;
+ OperatorType opType = opList.get(i - 1);
if (i == 1) {
printHints(operatorExpr.getHints(), step + 1);
}
@@ -472,8 +468,7 @@
@Override
public Void visit(DatasetDecl dd, Integer step) throws CompilationException {
if (dd.getDatasetType() == DatasetType.INTERNAL) {
- String temp = dd.getDatasetDetailsDecl().isTemp() ? "temporary" : "";
- out.print(skip(step) + "create " + temp + datasetSymbol + generateFullName(dd.getDataverse(), dd.getName())
+ out.print(skip(step) + "create " + datasetSymbol + generateFullName(dd.getDataverse(), dd.getName())
+ generateIfNotExists(dd.getIfNotExists()) + "(" + dd.getQualifiedTypeName() + ")"
+ " primary key ");
printDelimitedKeys(((InternalDetailsDecl) dd.getDatasetDetailsDecl()).getPartitioningExprs(), ",");
@@ -657,7 +652,7 @@
out.print(skip(step) + CREATE + " index ");
out.print(normalize(cis.getIndexName().getValue()) + " ");
out.print(generateIfNotExists(cis.getIfNotExists()));
- out.print(" on ");;
+ out.print(" on ");
out.print(generateFullName(cis.getDataverseName(), cis.getDatasetName()));
out.print(" (");
@@ -827,7 +822,8 @@
public Void visit(CreateFunctionStatement cfs, Integer step) throws CompilationException {
out.print(skip(step) + CREATE + " function ");
out.print(generateIfNotExists(cfs.getIfNotExists()));
- out.print(this.generateFullName(cfs.getSignature().getNamespace(), cfs.getSignature().getName()));
+ out.print(
+ this.generateFullName(cfs.getFunctionSignature().getNamespace(), cfs.getFunctionSignature().getName()));
out.print("(");
printDelimitedStrings(cfs.getParamList(), COMMA);
out.println(") {");
diff --git a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/QueryPrintVisitor.java b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/QueryPrintVisitor.java
index 5e01321..ff55880 100644
--- a/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/QueryPrintVisitor.java
+++ b/asterixdb/asterix-lang-common/src/main/java/org/apache/asterix/lang/common/visitor/QueryPrintVisitor.java
@@ -65,19 +65,15 @@
import org.apache.asterix.lang.common.struct.QuantifiedPair;
import org.apache.asterix.lang.common.visitor.base.AbstractQueryExpressionVisitor;
-public class QueryPrintVisitor extends AbstractQueryExpressionVisitor<Void, Integer> {
- private final PrintWriter out;
+public abstract class QueryPrintVisitor extends AbstractQueryExpressionVisitor<Void, Integer> {
+ protected final PrintWriter out;
- public QueryPrintVisitor() {
- out = new PrintWriter(System.out);
- }
-
- public QueryPrintVisitor(PrintWriter out) {
+ protected QueryPrintVisitor(PrintWriter out) {
this.out = out;
}
protected String skip(int step) {
- StringBuffer sb = new StringBuffer();
+ StringBuilder sb = new StringBuilder();
for (int i = 0; i < step; i++) {
sb.append(" ");
}
@@ -121,7 +117,7 @@
ordered = true;
}
- out.println(skip(step) + (ordered == true ? "OrderedListConstructor " : "UnorderedListConstructor ") + "[");
+ out.println(skip(step) + (ordered ? "OrderedListConstructor " : "UnorderedListConstructor ") + "[");
for (Expression e : lc.getExprList()) {
e.accept(this, step + 1);
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
index 05300d1..7163e3c 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/CaseExpression.java
@@ -23,6 +23,7 @@
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.expression.LiteralExpr;
import org.apache.asterix.lang.common.literal.NullLiteral;
@@ -30,7 +31,7 @@
import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class CaseExpression implements Expression {
+public class CaseExpression extends AbstractExpression {
private Expression conditionExpr;
private List<Expression> whenExprs = new ArrayList<>();
@@ -125,5 +126,4 @@
return ObjectUtils.equals(conditionExpr, target.conditionExpr) && ObjectUtils.equals(elseExpr, target.elseExpr)
&& ObjectUtils.equals(thenExprs, target.thenExprs) && ObjectUtils.equals(thenExprs, thenExprs);
}
-
}
\ No newline at end of file
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java
deleted file mode 100644
index 24a6217..0000000
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/IndependentSubquery.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterix.lang.sqlpp.expression;
-
-import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.lang.common.base.Expression;
-import org.apache.asterix.lang.common.visitor.base.ILangVisitor;
-import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
-
-public class IndependentSubquery implements Expression {
-
- private Expression expr;
-
- public IndependentSubquery(Expression enclosedExpr) {
- this.expr = enclosedExpr;
- }
-
- @Override
- public <R, T> R accept(ILangVisitor<R, T> visitor, T arg) throws CompilationException {
- return ((ISqlppVisitor<R, T>) visitor).visit(this, arg);
- }
-
- @Override
- public Kind getKind() {
- return Kind.INDEPENDENT_SUBQUERY;
- }
-
- public void setExpr(Expression expr) {
- this.expr = expr;
- }
-
- public Expression getExpr() {
- return this.expr;
- }
-
- @Override
- public String toString() {
- return String.valueOf(expr);
- }
-
- @Override
- public int hashCode() {
- return expr.hashCode();
- }
-
- @Override
- public boolean equals(Object object) {
- if (this == object) {
- return true;
- }
- if (!(object instanceof IndependentSubquery)) {
- return false;
- }
- IndependentSubquery target = (IndependentSubquery) object;
- return this.expr.equals(target.getExpr());
- }
-}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
index 0fb687a..16eab44 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/expression/SelectExpression.java
@@ -22,7 +22,7 @@
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.lang.common.base.Expression;
+import org.apache.asterix.lang.common.base.AbstractExpression;
import org.apache.asterix.lang.common.clause.LetClause;
import org.apache.asterix.lang.common.clause.LimitClause;
import org.apache.asterix.lang.common.clause.OrderbyClause;
@@ -31,7 +31,7 @@
import org.apache.asterix.lang.sqlpp.visitor.base.ISqlppVisitor;
import org.apache.commons.lang3.ObjectUtils;
-public class SelectExpression implements Expression {
+public class SelectExpression extends AbstractExpression {
private List<LetClause> letList = new ArrayList<>();
private SelectSetOperation selectSetOperation;
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
index 60ccea6..a2de694 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/SqlppQueryRewriter.java
@@ -46,7 +46,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.parser.FunctionParser;
import org.apache.asterix.lang.sqlpp.parser.SqlppParserFactory;
@@ -384,12 +383,6 @@
}
@Override
- public Void visit(IndependentSubquery independentSubquery, Void arg) throws CompilationException {
- independentSubquery.getExpr().accept(this, arg);
- return null;
- }
-
- @Override
public Void visit(CaseExpression caseExpression, Void arg) throws CompilationException {
caseExpression.getConditionExpr().accept(this, arg);
for (Expression expr : caseExpression.getWhenExprs()) {
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
index aa337e3..43e62d1 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/OperatorExpressionVisitor.java
@@ -24,6 +24,7 @@
import java.util.List;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.functions.FunctionConstants;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
@@ -35,13 +36,13 @@
import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.common.struct.QuantifiedPair;
+import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppExpressionScopingVisitor;
+import org.apache.asterix.om.functions.BuiltinFunctions;
import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
public class OperatorExpressionVisitor extends AbstractSqlppExpressionScopingVisitor {
- private static final String CONCAT = "concat";
-
public OperatorExpressionVisitor(LangRewritingContext context) {
super(context);
}
@@ -75,12 +76,17 @@
}
private Expression processLikeOperator(OperatorExpr operatorExpr, OperatorType opType) {
- Expression likeExpr = new CallExpr(new FunctionSignature(null, "like", 2), operatorExpr.getExprList());
- if (opType == OperatorType.LIKE) {
- return likeExpr;
+ Expression likeExpr =
+ new CallExpr(new FunctionSignature(BuiltinFunctions.STRING_LIKE), operatorExpr.getExprList());
+ switch (opType) {
+ case LIKE:
+ return likeExpr;
+ case NOT_LIKE:
+ return new CallExpr(new FunctionSignature(BuiltinFunctions.NOT),
+ new ArrayList<>(Collections.singletonList(likeExpr)));
+ default:
+ throw new IllegalArgumentException(String.valueOf(opType));
}
- return new CallExpr(new FunctionSignature(null, "not", 1),
- new ArrayList<>(Collections.singletonList(likeExpr)));
}
private Expression processInOperator(OperatorExpr operatorExpr, OperatorType opType) throws CompilationException {
@@ -92,11 +98,11 @@
comparison.addOperand(bindingVar);
comparison.setCurrentop(true);
if (opType == OperatorType.IN) {
- comparison.addOperator("=");
+ comparison.addOperator(OperatorType.EQ);
return new QuantifiedExpression(Quantifier.SOME, new ArrayList<>(
Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), comparison);
} else {
- comparison.addOperator("!=");
+ comparison.addOperator(OperatorType.NEQ);
return new QuantifiedExpression(Quantifier.EVERY, new ArrayList<>(
Collections.singletonList(new QuantifiedPair(bindingVar, collectionExpr))), comparison);
}
@@ -104,7 +110,8 @@
private Expression processConcatOperator(OperatorExpr operatorExpr) {
// All operators have to be "||"s (according to the grammar).
- return new CallExpr(new FunctionSignature(null, CONCAT, 1), operatorExpr.getExprList());
+ return new CallExpr(new FunctionSignature(FunctionConstants.ASTERIX_NS, FunctionMapUtil.CONCAT, 1),
+ operatorExpr.getExprList());
}
private Expression processBetweenOperator(OperatorExpr operatorExpr, OperatorType opType)
@@ -121,9 +128,9 @@
OperatorExpr andExpr = new OperatorExpr();
andExpr.addOperand(leftComparison);
andExpr.addOperand(rightComparison);
- andExpr.addOperator("and");
- return opType == OperatorType.BETWEEN ? andExpr :
- new CallExpr(new FunctionSignature(null, "not", 1),
+ andExpr.addOperator(OperatorType.AND);
+ return opType == OperatorType.BETWEEN ? andExpr
+ : new CallExpr(new FunctionSignature(BuiltinFunctions.NOT),
new ArrayList<>(Collections.singletonList(andExpr)));
}
@@ -132,7 +139,7 @@
OperatorExpr comparison = new OperatorExpr();
comparison.addOperand(lhs);
comparison.addOperand(rhs);
- comparison.addOperator("<=");
+ comparison.addOperator(OperatorType.LE);
if (hints != null) {
for (IExpressionAnnotation hint : hints) {
comparison.addHint(hint);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
index f168ebd..8d59a3b 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppBuiltinFunctionRewriteVisitor.java
@@ -29,12 +29,12 @@
import org.apache.asterix.lang.common.expression.LiteralExpr;
import org.apache.asterix.lang.common.expression.OperatorExpr;
import org.apache.asterix.lang.common.literal.TrueLiteral;
+import org.apache.asterix.lang.common.struct.OperatorType;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import org.apache.asterix.lang.sqlpp.util.SqlppRewriteUtil;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
-import org.apache.asterix.metadata.utils.MetadataConstants;
-import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.asterix.om.functions.BuiltinFunctions;
public class SqlppBuiltinFunctionRewriteVisitor extends AbstractSqlppSimpleExpressionVisitor {
@@ -63,8 +63,7 @@
return newCaseExpr;
}
// If the CASE expression does not contain a subquery, we rewrite it to a switch-case function call.
- FunctionSignature functionSignature = new FunctionSignature(MetadataConstants.METADATA_DATAVERSE_NAME,
- "switch-case", FunctionIdentifier.VARARGS);
+ FunctionSignature functionSignature = new FunctionSignature(BuiltinFunctions.SWITCH_CASE);
List<Expression> whenExprList = newCaseExpr.getWhenExprs();
List<Expression> thenExprList = newCaseExpr.getThenExprs();
List<Expression> newExprList = new ArrayList<>();
@@ -90,7 +89,7 @@
OperatorExpr operatorExpr = new OperatorExpr();
operatorExpr.addOperand((Expression) SqlppRewriteUtil.deepCopy(expr));
operatorExpr.addOperand(caseExpr.getConditionExpr());
- operatorExpr.addOperator("=");
+ operatorExpr.addOperator(OperatorType.EQ);
normalizedWhenExprs.add(operatorExpr);
}
return new CaseExpression(trueLiteral, normalizedWhenExprs, caseExpr.getThenExprs(), caseExpr.getElseExpr());
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
index c56bb9d..fd50c8e 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppDistinctAggregationSugarVisitor.java
@@ -72,8 +72,7 @@
Expression newExpr = rewriteArgument(expr);
newExprList.add(newExpr.accept(this, arg));
}
- callExpr.setFunctionSignature(
- new FunctionSignature(newAggFn.getNamespace(), newAggFn.getName(), newAggFn.getArity()));
+ callExpr.setFunctionSignature(new FunctionSignature(newAggFn));
callExpr.setExprList(newExprList);
return callExpr;
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
index 640b9b08..3bd29ef 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppInlineUdfsVisitor.java
@@ -43,7 +43,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
import org.apache.asterix.lang.sqlpp.util.SqlppRewriteUtil;
@@ -226,14 +225,6 @@
}
@Override
- public Boolean visit(IndependentSubquery independentSubquery, List<FunctionDecl> funcs)
- throws CompilationException {
- Pair<Boolean, Expression> p = inlineUdfsInExpr(independentSubquery.getExpr(), funcs);
- independentSubquery.setExpr(p.second);
- return p.first;
- }
-
- @Override
public Boolean visit(CaseExpression caseExpr, List<FunctionDecl> funcs) throws CompilationException {
Pair<Boolean, Expression> result = inlineUdfsInExpr(caseExpr.getConditionExpr(), funcs);
caseExpr.setConditionExpr(result.second);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
index c271365..6e6ffeb 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/VariableCheckAndRewriteVisitor.java
@@ -39,13 +39,13 @@
import org.apache.asterix.lang.sqlpp.visitor.CheckDatasetOnlyResolutionVisitor;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppExpressionScopingVisitor;
import org.apache.asterix.metadata.declared.MetadataProvider;
-import org.apache.asterix.metadata.utils.MetadataConstants;
+import org.apache.asterix.om.functions.BuiltinFunctions;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
public class VariableCheckAndRewriteVisitor extends AbstractSqlppExpressionScopingVisitor {
- protected final FunctionSignature datasetFunction =
- new FunctionSignature(MetadataConstants.METADATA_DATAVERSE_NAME, "dataset", 1);
+ private static final FunctionSignature FN_DATASET = new FunctionSignature(BuiltinFunctions.DATASET);
+
protected final boolean overwrite;
protected final MetadataProvider metadataProvider;
@@ -79,7 +79,7 @@
fa, parent);
if (resolvedExpr.getKind() == Kind.CALL_EXPRESSION) {
CallExpr callExpr = (CallExpr) resolvedExpr;
- if (callExpr.getFunctionSignature().equals(datasetFunction)) {
+ if (callExpr.getFunctionSignature().equals(FN_DATASET)) {
// The field access is resolved to be a dataset access in the form of "dataverse.dataset".
return resolvedExpr;
}
@@ -172,7 +172,7 @@
String fullyQualifiedName = dataverseName == null ? datasetName : dataverseName + "." + datasetName;
List<Expression> argList = new ArrayList<>();
argList.add(new LiteralExpr(new StringLiteral(fullyQualifiedName)));
- return new CallExpr(datasetFunction, argList);
+ return new CallExpr(new FunctionSignature(BuiltinFunctions.DATASET), argList);
}
private boolean datasetExists(String dataverseName, String datasetName) throws CompilationException {
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
index 8a8465d..06bb1b9 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/util/FunctionMapUtil.java
@@ -36,6 +36,7 @@
public class FunctionMapUtil {
+ public static final String CONCAT = "concat";
private final static String CORE_AGGREGATE_PREFIX = "coll_";
private final static String CORE_SQL_AGGREGATE_PREFIX = "array_";
private final static String INTERNAL_SQL_AGGREGATE_PREFIX = "sql-";
@@ -44,7 +45,7 @@
private static final Map<String, String> LIST_INPUT_FUNCTION_MAP = new HashMap<>();
static {
- LIST_INPUT_FUNCTION_MAP.put("concat", "string-concat");
+ LIST_INPUT_FUNCTION_MAP.put(CONCAT, BuiltinFunctions.STRING_CONCAT.getName());
LIST_INPUT_FUNCTION_MAP.put("greatest", CORE_SQL_AGGREGATE_PREFIX + "max");
LIST_INPUT_FUNCTION_MAP.put("least", CORE_SQL_AGGREGATE_PREFIX + "min");
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckDatasetOnlyResolutionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckDatasetOnlyResolutionVisitor.java
index cab7b5b..fe0c3a9 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckDatasetOnlyResolutionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckDatasetOnlyResolutionVisitor.java
@@ -53,7 +53,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppQueryExpressionVisitor;
@@ -226,11 +225,6 @@
}
@Override
- public Boolean visit(IndependentSubquery independentSubquery, ILangExpression arg) throws CompilationException {
- return false;
- }
-
- @Override
public Boolean visit(CaseExpression caseExpr, ILangExpression arg) throws CompilationException {
return false;
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSql92AggregateVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSql92AggregateVisitor.java
index 1fd110c..cd91405 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSql92AggregateVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSql92AggregateVisitor.java
@@ -56,7 +56,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppQueryExpressionVisitor;
@@ -270,11 +269,6 @@
}
@Override
- public Boolean visit(IndependentSubquery independentSubquery, ILangExpression arg) throws CompilationException {
- return false;
- }
-
- @Override
public Boolean visit(CaseExpression caseExpr, ILangExpression arg) throws CompilationException {
return caseExpr.getConditionExpr().accept(this, arg) || visitExprList(caseExpr.getWhenExprs(), arg)
|| visitExprList(caseExpr.getThenExprs(), arg) || caseExpr.getElseExpr().accept(this, arg);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSubqueryVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSubqueryVisitor.java
index 7f93b2f..c53d8d2 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSubqueryVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/CheckSubqueryVisitor.java
@@ -60,7 +60,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppQueryExpressionVisitor;
@@ -169,11 +168,6 @@
}
@Override
- public Boolean visit(IndependentSubquery independentSubquery, ILangExpression arg) throws CompilationException {
- return visit(independentSubquery.getExpr(), arg);
- }
-
- @Override
public Boolean visit(CaseExpression caseExpression, ILangExpression arg) throws CompilationException {
return visit(caseExpression.getConditionExpr(), arg) || visit(caseExpression.getWhenExprs(), arg)
|| visit(caseExpression.getThenExprs(), arg) || visit(caseExpression.getElseExpr(), arg);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/DeepCopyVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/DeepCopyVisitor.java
index 37e4e26..0d3f320 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/DeepCopyVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/DeepCopyVisitor.java
@@ -64,7 +64,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationInput;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
@@ -415,11 +414,6 @@
}
@Override
- public ILangExpression visit(IndependentSubquery independentSubquery, Void arg) throws CompilationException {
- return new IndependentSubquery((Expression) independentSubquery.getExpr().accept(this, arg));
- }
-
- @Override
public ILangExpression visit(CaseExpression caseExpr, Void arg) throws CompilationException {
Expression conditionExpr = (Expression) caseExpr.getConditionExpr().accept(this, arg);
List<Expression> whenExprList = copyExprList(caseExpr.getWhenExprs(), arg);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/FreeVariableVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/FreeVariableVisitor.java
index e152b9b..6c38334 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/FreeVariableVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/FreeVariableVisitor.java
@@ -61,7 +61,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil;
@@ -414,13 +413,6 @@
}
@Override
- public Void visit(IndependentSubquery independentSubquery, Collection<VariableExpr> freeVars)
- throws CompilationException {
- independentSubquery.getExpr().accept(this, freeVars);
- return null;
- }
-
- @Override
public Void visit(CaseExpression caseExpr, Collection<VariableExpr> freeVars) throws CompilationException {
caseExpr.getConditionExpr().accept(this, freeVars);
visit(caseExpr.getWhenExprs(), freeVars);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java
index e52bee3..38d09f9 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppAstPrintVisitor.java
@@ -44,7 +44,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
@@ -54,16 +53,8 @@
public class SqlppAstPrintVisitor extends QueryPrintVisitor implements ISqlppVisitor<Void, Integer> {
- private final PrintWriter out;
-
- public SqlppAstPrintVisitor() {
- super();
- out = new PrintWriter(System.out);
- }
-
public SqlppAstPrintVisitor(PrintWriter out) {
super(out);
- this.out = out;
}
@Override
@@ -300,12 +291,6 @@
}
@Override
- public Void visit(IndependentSubquery independentSubquery, Integer arg) throws CompilationException {
- independentSubquery.getExpr().accept(this, arg);
- return null;
- }
-
- @Override
public Void visit(CaseExpression caseExpr, Integer step) throws CompilationException {
out.print(skip(step) + "CASE");
caseExpr.getConditionExpr().accept(this, step + 2);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppCloneAndSubstituteVariablesVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppCloneAndSubstituteVariablesVisitor.java
index 8904241..844856d 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppCloneAndSubstituteVariablesVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppCloneAndSubstituteVariablesVisitor.java
@@ -49,7 +49,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationInput;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
@@ -381,14 +380,6 @@
}
@Override
- public Pair<ILangExpression, VariableSubstitutionEnvironment> visit(IndependentSubquery independentSubquery,
- VariableSubstitutionEnvironment env) throws CompilationException {
- Pair<ILangExpression, VariableSubstitutionEnvironment> p = independentSubquery.getExpr().accept(this, env);
- IndependentSubquery newSubquery = new IndependentSubquery((Expression) p.first);
- return new Pair<>(newSubquery, p.second);
- }
-
- @Override
public Pair<ILangExpression, VariableSubstitutionEnvironment> visit(CaseExpression caseExpr,
VariableSubstitutionEnvironment env) throws CompilationException {
Expression conditionExpr = (Expression) caseExpr.getConditionExpr().accept(this, env).first;
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java
index 680ce55..4cda253 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppDeleteRewriteVisitor.java
@@ -42,6 +42,7 @@
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationInput;
import org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppAstVisitor;
+import org.apache.asterix.om.functions.BuiltinFunctions;
/**
* This class rewrites delete statement to contain a query that specifying
@@ -58,8 +59,7 @@
: dataverseName.getValue() + "." + datasetName.getValue();
LiteralExpr argumentLiteral = new LiteralExpr(new StringLiteral(arg));
arguments.add(argumentLiteral);
- CallExpr callExpression =
- new CallExpr(new FunctionSignature(FunctionConstants.ASTERIX_NS, "dataset", 1), arguments);
+ CallExpr callExpression = new CallExpr(new FunctionSignature(BuiltinFunctions.DATASET), arguments);
// From clause.
VariableExpr var = deleteStmt.getVariableExpr();
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppFormatPrintVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppFormatPrintVisitor.java
index a62a1cc..51444e8 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppFormatPrintVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/SqlppFormatPrintVisitor.java
@@ -43,7 +43,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil;
@@ -51,15 +50,8 @@
public class SqlppFormatPrintVisitor extends FormatPrintVisitor implements ISqlppVisitor<Void, Integer> {
- private final PrintWriter out;
-
- public SqlppFormatPrintVisitor() {
- this(new PrintWriter(System.out));
- }
-
public SqlppFormatPrintVisitor(PrintWriter out) {
super(out);
- this.out = out;
// Initialize symbols
dataverseSymbol = " database ";
@@ -309,12 +301,6 @@
}
@Override
- public Void visit(IndependentSubquery independentSubquery, Integer step) throws CompilationException {
- independentSubquery.getExpr().accept(this, step);
- return null;
- }
-
- @Override
public Void visit(CaseExpression caseExpr, Integer step) throws CompilationException {
out.print(skip(step) + "case ");
caseExpr.getConditionExpr().accept(this, step + 2);
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppAstVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppAstVisitor.java
index ec17484..5396768 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppAstVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppAstVisitor.java
@@ -33,7 +33,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
/**
@@ -107,11 +106,6 @@
}
@Override
- public R visit(IndependentSubquery independentSubquery, T arg) throws CompilationException {
- return null;
- }
-
- @Override
public R visit(CaseExpression caseExpr, T arg) throws CompilationException {
return null;
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
index 96c5987..2f9cb32 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppExpressionScopingVisitor.java
@@ -54,19 +54,15 @@
import org.apache.asterix.lang.sqlpp.clause.NestClause;
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil;
-import org.apache.asterix.metadata.utils.MetadataConstants;
+import org.apache.asterix.om.functions.BuiltinFunctions;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.core.algebra.base.Counter;
-import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
public class AbstractSqlppExpressionScopingVisitor extends AbstractSqlppSimpleExpressionVisitor {
- protected final FunctionSignature resolveFunction =
- new FunctionSignature(MetadataConstants.METADATA_DATAVERSE_NAME, "resolve", FunctionIdentifier.VARARGS);
protected final ScopeChecker scopeChecker = new ScopeChecker();
protected final LangRewritingContext context;
@@ -320,18 +316,6 @@
}
@Override
- public Expression visit(IndependentSubquery independentSubquery, ILangExpression arg) throws CompilationException {
- // Masks parent scopes so as that the subquery is independent of the environment.
- // In this way, free variables defined in the subquery will not be resolved using
- // variables defined in the parent scope.
- Scope scope = new Scope(scopeChecker, scopeChecker.getCurrentScope(), true);
- scopeChecker.pushExistingScope(scope);
- independentSubquery.setExpr(visit(independentSubquery.getExpr(), independentSubquery));
- scopeChecker.removeCurrentScope();
- return independentSubquery;
- }
-
- @Override
public Expression visit(QuantifiedExpression qe, ILangExpression arg) throws CompilationException {
scopeChecker.createNewScope();
for (QuantifiedPair pair : qe.getQuantifiedList()) {
@@ -389,7 +373,7 @@
String varName = SqlppVariableUtil.toUserDefinedVariableName(expr.getVar().getValue()).getValue();
argList.add(new LiteralExpr(new StringLiteral(varName)));
argList.addAll(liveVars);
- return new CallExpr(resolveFunction, argList);
+ return new CallExpr(new FunctionSignature(BuiltinFunctions.RESOLVE), argList);
}
// Adds a new encountered alias identifier into a scope
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java
index a2e43a21..4d35914 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/AbstractSqlppSimpleExpressionVisitor.java
@@ -60,7 +60,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
import org.apache.asterix.lang.sqlpp.struct.SetOperationRight;
@@ -337,12 +336,6 @@
}
@Override
- public Expression visit(IndependentSubquery independentSubquery, ILangExpression arg) throws CompilationException {
- independentSubquery.setExpr(visit(independentSubquery.getExpr(), arg));
- return independentSubquery;
- }
-
- @Override
public Expression visit(CaseExpression caseExpr, ILangExpression arg) throws CompilationException {
caseExpr.setConditionExpr(visit(caseExpr.getConditionExpr(), arg));
caseExpr.setWhenExprs(visit(caseExpr.getWhenExprs(), arg));
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/ISqlppVisitor.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/ISqlppVisitor.java
index 639f3b5..02d9142 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/ISqlppVisitor.java
+++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/visitor/base/ISqlppVisitor.java
@@ -33,7 +33,6 @@
import org.apache.asterix.lang.sqlpp.clause.SelectSetOperation;
import org.apache.asterix.lang.sqlpp.clause.UnnestClause;
import org.apache.asterix.lang.sqlpp.expression.CaseExpression;
-import org.apache.asterix.lang.sqlpp.expression.IndependentSubquery;
import org.apache.asterix.lang.sqlpp.expression.SelectExpression;
public interface ISqlppVisitor<R, T> extends ILangVisitor<R, T> {
@@ -64,7 +63,5 @@
R visit(HavingClause havingClause, T arg) throws CompilationException;
- R visit(IndependentSubquery independentSubquery, T arg) throws CompilationException;
-
R visit(CaseExpression caseExpression, T arg) throws CompilationException;
}
diff --git a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
index d3a64d8..7ac8c57 100644
--- a/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
+++ b/asterixdb/asterix-lang-sqlpp/src/main/javacc/SQLPP.jj
@@ -64,6 +64,7 @@
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
import org.apache.asterix.common.exceptions.CompilationException;
+import org.apache.asterix.common.functions.FunctionConstants;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.Literal;
@@ -165,6 +166,7 @@
import org.apache.asterix.lang.sqlpp.util.ExpressionToVariableUtil;
import org.apache.asterix.lang.sqlpp.util.FunctionMapUtil;
import org.apache.asterix.lang.sqlpp.util.SqlppVariableUtil;
+import org.apache.asterix.om.functions.BuiltinFunctions;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.common.utils.Triple;
import org.apache.hyracks.algebricks.core.algebra.expressions.IExpressionAnnotation;
@@ -499,7 +501,6 @@
DatasetDecl dsetDecl = null;
boolean autogenerated = false;
String compactionPolicy = null;
- boolean temp = false;
Pair<Integer, List<String>> filterField = null;
Pair<Identifier,Identifier> metaTypeComponents = new Pair<Identifier, Identifier>(null, null);
}
@@ -531,7 +532,7 @@
ifNotExists);
}
- | (<INTERNAL> | <TEMPORARY> { temp = true; })?
+ | ( <INTERNAL> )?
Dataset() nameComponents = QualifiedName()
<LEFTPAREN> typeComponents = TypeName() <RIGHTPAREN>
(
@@ -559,8 +560,7 @@
InternalDetailsDecl idd = new InternalDetailsDecl(primaryKeyFields.second,
primaryKeyFields.first,
autogenerated,
- filterField == null? null : filterField.second,
- temp);
+ filterField == null? null : filterField.second);
dsetDecl = new DatasetDecl(nameComponents.first,
nameComponents.second,
typeComponents.first,
@@ -1856,7 +1856,7 @@
(<NOT> { not = true; } )? inputExpr = RelExpr()
{
if(not){
- FunctionSignature signature = new FunctionSignature(null, "not", 1);
+ FunctionSignature signature = new FunctionSignature(BuiltinFunctions.NOT);
return new CallExpr(signature, new ArrayList<Expression>(Collections.singletonList(inputExpr)));
} else {
return inputExpr;
@@ -1985,16 +1985,22 @@
Expression expr = null;
Expression operand = null;
boolean not = false;
+ FunctionIdentifier fn = null;
}
{
operand = LikeExpr()
- ( <IS> (<NOT> { not = true; })? (<NULL> | <MISSING> | <UNKOWN>)
+ ( <IS>
+ (<NOT> { not = true; })?
+ (
+ <NULL> { fn = BuiltinFunctions.IS_NULL; } |
+ <MISSING> { fn = BuiltinFunctions.IS_MISSING; } |
+ <UNKNOWN> { fn = BuiltinFunctions.IS_UNKNOWN; }
+ )
{
- String functionName = "is-" + token.image.toLowerCase();
- FunctionSignature signature = new FunctionSignature(null, functionName, 1);
+ FunctionSignature signature = new FunctionSignature(fn);
expr = new CallExpr(signature, new ArrayList<Expression>(Collections.singletonList(operand)));
if(not) {
- FunctionSignature notSignature = new FunctionSignature(null, "not", 1);
+ FunctionSignature notSignature = new FunctionSignature(BuiltinFunctions.NOT);
expr = new CallExpr(notSignature, new ArrayList<Expression>(Collections.singletonList(expr)));
}
}
@@ -3257,12 +3263,12 @@
| <SOME : "some">
| <START : "start">
| <STOP : "stop">
- | <TEMPORARY : "temporary">
+ | <TEMPORARY : "temporary"> // intentionally not used but reserved for future usage
| <THEN : "then">
| <TYPE : "type">
| <TO : "to">
| <UNION : "union">
- | <UNKOWN : "unknown">
+ | <UNKNOWN : "unknown">
| <UNNEST : "unnest">
| <UPDATE : "update">
| <UPSERT : "upsert">
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/GarbageCollector.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/GarbageCollector.java
deleted file mode 100644
index a97e22a..0000000
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/GarbageCollector.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.metadata;
-
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- * Periodically recycle temporary datasets.
- *
- * @author yingyib
- */
-public class GarbageCollector implements Runnable {
- private static final Logger LOGGER = Logger.getLogger(GarbageCollector.class.getName());
-
- // TODO(mblow): make this configurable
- private static final long CLEANUP_PERIOD = 1;
- private static final TimeUnit CLEANUP_PERIOD_UNIT = TimeUnit.DAYS;
-
- static {
- // Starts the garbage collector thread which
- // should always be running.
- Thread gcThread = new Thread(new GarbageCollector(), "Metadata GC");
- gcThread.setDaemon(true);
- gcThread.start();
- }
-
- @Override
- @SuppressWarnings({"squid:S2142", "squid:S2189"}) // rethrow/interrupt thread on InterruptedException, endless loop
- public void run() {
- LOGGER.info("Starting Metadata GC");
- while (true) {
- try {
- synchronized (this) {
- CLEANUP_PERIOD_UNIT.timedWait(this, CLEANUP_PERIOD);
- }
- MetadataManager.INSTANCE.cleanupTempDatasets();
- } catch (InterruptedException e) {
- break;
- } catch (Exception e) {
- LOGGER.log(Level.WARNING, "Exception cleaning temp datasets", e);
- }
- }
- LOGGER.info("Exiting Metadata GC");
- }
-
- public static void ensure() {
- // no need to do anything, <clinit> does the work
- }
-}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/IDatasetDetails.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/IDatasetDetails.java
index b9ced54..47c6432 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/IDatasetDetails.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/IDatasetDetails.java
@@ -26,28 +26,7 @@
public interface IDatasetDetails extends Serializable {
- public DatasetType getDatasetType();
+ DatasetType getDatasetType();
- public void writeDatasetDetailsRecordType(DataOutput out) throws HyracksDataException;
-
- /**
- * @return if the dataset is a temporary dataset.
- * Here is a summary of temporary datasets:
- * 1. Different from a persistent dataset, reads and writes over a temporary dataset do not require any lock.
- * Writes over a temporary dataset do not generate any write-ahead update and commit log but generate
- * flush log and job commit log.
- * 2. A temporary dataset can only be an internal dataset, stored in partitioned LSM-Btrees.
- * 3. All secondary indexes for persistent datasets are supported for temporary datasets.
- * 4. A temporary dataset will be automatically garbage collected if it is not active in the past 30 days.
- * A temporary dataset could be used for the following scenarios:
- * 1. A data scientist wants to run some one-time data analysis queries over a dataset that s/he pre-processed
- * and the dataset is only used by her/himself in an one-query-at-a-time manner.
- * 2. Articulate AQL with external systems such as Pregelix/IMRU/Spark. A user can first run an AQL
- * query to populate a temporary dataset, then kick off an external runtime to read this dataset,
- * dump the results of the external runtime to yet-another-temporary dataset, and finally run yet-another AQL
- * over the second temporary dataset.
- */
- public boolean isTemp();
-
- public long getLastAccessTime();
+ void writeDatasetDetailsRecordType(DataOutput out) throws HyracksDataException;
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
index 8f88ca7..4f827f5 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataCache.java
@@ -50,8 +50,6 @@
*/
public class MetadataCache {
- // Default life time period of a temp dataset. It is 30 days.
- private final static long TEMP_DATASET_INACTIVE_TIME_THRESHOLD = 3600 * 24 * 30 * 1000L;
// Key is dataverse name.
protected final Map<String, Dataverse> dataverses = new HashMap<>();
// Key is dataverse name. Key of value map is dataset name.
@@ -574,28 +572,6 @@
}
/**
- * Clean up temp datasets that are expired.
- * The garbage collection will pause other dataset operations.
- */
- public void cleanupTempDatasets() {
- synchronized (datasets) {
- for (Map<String, Dataset> map : datasets.values()) {
- Iterator<Dataset> datasetIterator = map.values().iterator();
- while (datasetIterator.hasNext()) {
- Dataset dataset = datasetIterator.next();
- if (dataset.getDatasetDetails().isTemp()) {
- long currentTime = System.currentTimeMillis();
- long duration = currentTime - dataset.getDatasetDetails().getLastAccessTime();
- if (duration > TEMP_DATASET_INACTIVE_TIME_THRESHOLD) {
- datasetIterator.remove();
- }
- }
- }
- }
- }
- }
-
- /**
* Represents a logical operation against the metadata.
*/
protected class MetadataLogicalOperation {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
index 23e6fb0..f8adc81 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataManager.java
@@ -32,7 +32,7 @@
import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.exceptions.RuntimeDataException;
import org.apache.asterix.common.functions.FunctionSignature;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.ExternalFile;
import org.apache.asterix.metadata.api.IAsterixStateProxy;
import org.apache.asterix.metadata.api.IExtensionMetadataEntity;
@@ -53,7 +53,8 @@
import org.apache.asterix.metadata.entities.Node;
import org.apache.asterix.metadata.entities.NodeGroup;
import org.apache.asterix.om.types.ARecordType;
-import org.apache.asterix.transaction.management.service.transaction.JobIdFactory;
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.exceptions.HyracksDataException;
/**
@@ -95,7 +96,8 @@
private final ReadWriteLock metadataLatch;
protected boolean rebindMetadataNode = false;
- // TODO(mblow): replace references of this (non-constant) field with a method, update field name accordingly
+ // TODO(mblow): replace references of this (non-constant) field with a method,
+ // update field name accordingly
public static IMetadataManager INSTANCE;
private MetadataManager(IAsterixStateProxy proxy, IMetadataNode metadataNode) {
@@ -116,41 +118,41 @@
@Override
public void init() throws HyracksDataException {
- GarbageCollector.ensure();
+ // no op
}
@Override
public MetadataTransactionContext beginTransaction() throws RemoteException, ACIDException {
- JobId jobId = JobIdFactory.generateJobId();
- metadataNode.beginTransaction(jobId);
- return new MetadataTransactionContext(jobId);
+ TxnId txnId = TxnIdFactory.create();
+ metadataNode.beginTransaction(txnId);
+ return new MetadataTransactionContext(txnId);
}
@Override
public void commitTransaction(MetadataTransactionContext ctx) throws RemoteException, ACIDException {
- metadataNode.commitTransaction(ctx.getJobId());
+ metadataNode.commitTransaction(ctx.getTxnId());
cache.commit(ctx);
}
@Override
public void abortTransaction(MetadataTransactionContext ctx) throws RemoteException, ACIDException {
- metadataNode.abortTransaction(ctx.getJobId());
+ metadataNode.abortTransaction(ctx.getTxnId());
}
@Override
public void lock(MetadataTransactionContext ctx, byte lockMode) throws RemoteException, ACIDException {
- metadataNode.lock(ctx.getJobId(), lockMode);
+ metadataNode.lock(ctx.getTxnId(), lockMode);
}
@Override
public void unlock(MetadataTransactionContext ctx, byte lockMode) throws RemoteException, ACIDException {
- metadataNode.unlock(ctx.getJobId(), lockMode);
+ metadataNode.unlock(ctx.getTxnId(), lockMode);
}
@Override
- public void addDataverse(MetadataTransactionContext ctx, Dataverse dataverse) throws MetadataException {
+ public void addDataverse(MetadataTransactionContext ctx, Dataverse dataverse) throws AlgebricksException {
try {
- metadataNode.addDataverse(ctx.getJobId(), dataverse);
+ metadataNode.addDataverse(ctx.getTxnId(), dataverse);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -158,9 +160,9 @@
}
@Override
- public void dropDataverse(MetadataTransactionContext ctx, String dataverseName) throws MetadataException {
+ public void dropDataverse(MetadataTransactionContext ctx, String dataverseName) throws AlgebricksException {
try {
- metadataNode.dropDataverse(ctx.getJobId(), dataverseName);
+ metadataNode.dropDataverse(ctx.getTxnId(), dataverseName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -168,16 +170,16 @@
}
@Override
- public List<Dataverse> getDataverses(MetadataTransactionContext ctx) throws MetadataException {
+ public List<Dataverse> getDataverses(MetadataTransactionContext ctx) throws AlgebricksException {
try {
- return metadataNode.getDataverses(ctx.getJobId());
+ return metadataNode.getDataverses(ctx.getTxnId());
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
}
@Override
- public Dataverse getDataverse(MetadataTransactionContext ctx, String dataverseName) throws MetadataException {
+ public Dataverse getDataverse(MetadataTransactionContext ctx, String dataverseName) throws AlgebricksException {
// First look in the context to see if this transaction created the
// requested dataverse itself (but the dataverse is still uncommitted).
Dataverse dataverse = ctx.getDataverse(dataverseName);
@@ -197,7 +199,7 @@
return dataverse;
}
try {
- dataverse = metadataNode.getDataverse(ctx.getJobId(), dataverseName);
+ dataverse = metadataNode.getDataverse(ctx.getTxnId(), dataverseName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -211,24 +213,12 @@
@Override
public List<Dataset> getDataverseDatasets(MetadataTransactionContext ctx, String dataverseName)
- throws MetadataException {
+ throws AlgebricksException {
List<Dataset> dataverseDatasets = new ArrayList<>();
- // add uncommitted temporary datasets
- for (Dataset dataset : ctx.getDataverseDatasets(dataverseName)) {
- if (dataset.getDatasetDetails().isTemp()) {
- dataverseDatasets.add(dataset);
- }
- }
- // add the committed temporary datasets with the cache
- for (Dataset dataset : cache.getDataverseDatasets(dataverseName)) {
- if (dataset.getDatasetDetails().isTemp()) {
- dataverseDatasets.add(dataset);
- }
- }
try {
// Assuming that the transaction can read its own writes on the
// metadata node.
- dataverseDatasets.addAll(metadataNode.getDataverseDatasets(ctx.getJobId(), dataverseName));
+ dataverseDatasets.addAll(metadataNode.getDataverseDatasets(ctx.getTxnId(), dataverseName));
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -238,40 +228,32 @@
}
@Override
- public void addDataset(MetadataTransactionContext ctx, Dataset dataset) throws MetadataException {
+ public void addDataset(MetadataTransactionContext ctx, Dataset dataset) throws AlgebricksException {
// add dataset into metadataNode
- if (!dataset.getDatasetDetails().isTemp()) {
- try {
- metadataNode.addDataset(ctx.getJobId(), dataset);
- } catch (RemoteException e) {
- throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
- }
+ try {
+ metadataNode.addDataset(ctx.getTxnId(), dataset);
+ } catch (RemoteException e) {
+ throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
-
// reflect the dataset into the cache
ctx.addDataset(dataset);
}
@Override
public void dropDataset(MetadataTransactionContext ctx, String dataverseName, String datasetName)
- throws MetadataException {
- Dataset dataset = findDataset(ctx, dataverseName, datasetName);
- // If a dataset is not in the cache, then it could not be a temp dataset
- if (dataset == null || !dataset.getDatasetDetails().isTemp()) {
- try {
- metadataNode.dropDataset(ctx.getJobId(), dataverseName, datasetName);
- } catch (RemoteException e) {
- throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
- }
+ throws AlgebricksException {
+ try {
+ metadataNode.dropDataset(ctx.getTxnId(), dataverseName, datasetName);
+ } catch (RemoteException e) {
+ throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
-
// Drops the dataset from cache
ctx.dropDataset(dataverseName, datasetName);
}
@Override
public Dataset getDataset(MetadataTransactionContext ctx, String dataverseName, String datasetName)
- throws MetadataException {
+ throws AlgebricksException {
// First look in the context to see if this transaction created the
// requested dataset itself (but the dataset is still uncommitted).
@@ -293,7 +275,7 @@
return dataset;
}
try {
- dataset = metadataNode.getDataset(ctx.getJobId(), dataverseName, datasetName);
+ dataset = metadataNode.getDataset(ctx.getTxnId(), dataverseName, datasetName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -307,31 +289,25 @@
@Override
public List<Index> getDatasetIndexes(MetadataTransactionContext ctx, String dataverseName, String datasetName)
- throws MetadataException {
+ throws AlgebricksException {
List<Index> datasetIndexes = new ArrayList<>();
Dataset dataset = findDataset(ctx, dataverseName, datasetName);
if (dataset == null) {
return datasetIndexes;
}
- if (dataset.getDatasetDetails().isTemp()) {
- // for temp datsets
- datasetIndexes = cache.getDatasetIndexes(dataverseName, datasetName);
- } else {
- try {
- // for persistent datasets
- datasetIndexes = metadataNode.getDatasetIndexes(ctx.getJobId(), dataverseName, datasetName);
- } catch (RemoteException e) {
- throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
- }
+ try {
+ datasetIndexes = metadataNode.getDatasetIndexes(ctx.getTxnId(), dataverseName, datasetName);
+ } catch (RemoteException e) {
+ throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
return datasetIndexes;
}
@Override
public void addCompactionPolicy(MetadataTransactionContext mdTxnCtx, CompactionPolicy compactionPolicy)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.addCompactionPolicy(mdTxnCtx.getJobId(), compactionPolicy);
+ metadataNode.addCompactionPolicy(mdTxnCtx.getTxnId(), compactionPolicy);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -340,11 +316,11 @@
@Override
public CompactionPolicy getCompactionPolicy(MetadataTransactionContext ctx, String dataverse, String policyName)
- throws MetadataException {
+ throws AlgebricksException {
CompactionPolicy compactionPolicy;
try {
- compactionPolicy = metadataNode.getCompactionPolicy(ctx.getJobId(), dataverse, policyName);
+ compactionPolicy = metadataNode.getCompactionPolicy(ctx.getTxnId(), dataverse, policyName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -352,15 +328,15 @@
}
@Override
- public void addDatatype(MetadataTransactionContext ctx, Datatype datatype) throws MetadataException {
+ public void addDatatype(MetadataTransactionContext ctx, Datatype datatype) throws AlgebricksException {
try {
- metadataNode.addDatatype(ctx.getJobId(), datatype);
+ metadataNode.addDatatype(ctx.getTxnId(), datatype);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
try {
ctx.addDatatype(
- metadataNode.getDatatype(ctx.getJobId(), datatype.getDataverseName(), datatype.getDatatypeName()));
+ metadataNode.getDatatype(ctx.getTxnId(), datatype.getDataverseName(), datatype.getDatatypeName()));
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -368,9 +344,9 @@
@Override
public void dropDatatype(MetadataTransactionContext ctx, String dataverseName, String datatypeName)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.dropDatatype(ctx.getJobId(), dataverseName, datatypeName);
+ metadataNode.dropDatatype(ctx.getTxnId(), dataverseName, datatypeName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -379,7 +355,7 @@
@Override
public Datatype getDatatype(MetadataTransactionContext ctx, String dataverseName, String datatypeName)
- throws MetadataException {
+ throws AlgebricksException {
// First look in the context to see if this transaction created the
// requested datatype itself (but the datatype is still uncommitted).
Datatype datatype = ctx.getDatatype(dataverseName, datatypeName);
@@ -397,9 +373,9 @@
datatype = cache.getDatatype(dataverseName, datatypeName);
if (datatype != null) {
// Datatype is already in the cache, don't add it again.
- //create a new Datatype object with a new ARecordType object in order to avoid
- //concurrent access to UTF8StringPointable comparator in ARecordType object.
- //see issue 510
+ // create a new Datatype object with a new ARecordType object in order to avoid
+ // concurrent access to UTF8StringPointable comparator in ARecordType object.
+ // see issue 510
ARecordType aRecType = (ARecordType) datatype.getDatatype();
return new Datatype(
datatype.getDataverseName(), datatype.getDatatypeName(), new ARecordType(aRecType.getTypeName(),
@@ -407,7 +383,7 @@
datatype.getIsAnonymous());
}
try {
- datatype = metadataNode.getDatatype(ctx.getJobId(), dataverseName, datatypeName);
+ datatype = metadataNode.getDatatype(ctx.getTxnId(), dataverseName, datatypeName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -420,24 +396,19 @@
}
@Override
- public void addIndex(MetadataTransactionContext ctx, Index index) throws MetadataException {
- String dataverseName = index.getDataverseName();
- String datasetName = index.getDatasetName();
- Dataset dataset = findDataset(ctx, dataverseName, datasetName);
- if (dataset == null || !dataset.getDatasetDetails().isTemp()) {
- try {
- metadataNode.addIndex(ctx.getJobId(), index);
- } catch (RemoteException e) {
- throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
- }
+ public void addIndex(MetadataTransactionContext ctx, Index index) throws AlgebricksException {
+ try {
+ metadataNode.addIndex(ctx.getTxnId(), index);
+ } catch (RemoteException e) {
+ throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
ctx.addIndex(index);
}
@Override
- public void addAdapter(MetadataTransactionContext mdTxnCtx, DatasourceAdapter adapter) throws MetadataException {
+ public void addAdapter(MetadataTransactionContext mdTxnCtx, DatasourceAdapter adapter) throws AlgebricksException {
try {
- metadataNode.addAdapter(mdTxnCtx.getJobId(), adapter);
+ metadataNode.addAdapter(mdTxnCtx.getTxnId(), adapter);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -447,23 +418,18 @@
@Override
public void dropIndex(MetadataTransactionContext ctx, String dataverseName, String datasetName, String indexName)
- throws MetadataException {
- Dataset dataset = findDataset(ctx, dataverseName, datasetName);
- // If a dataset is not in the cache, then it could be an unloaded persistent dataset.
- // If the dataset is a temp dataset, then we do not need to call any MedataNode operations.
- if (dataset == null || !dataset.getDatasetDetails().isTemp()) {
- try {
- metadataNode.dropIndex(ctx.getJobId(), dataverseName, datasetName, indexName);
- } catch (RemoteException e) {
- throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
- }
+ throws AlgebricksException {
+ try {
+ metadataNode.dropIndex(ctx.getTxnId(), dataverseName, datasetName, indexName);
+ } catch (RemoteException e) {
+ throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
ctx.dropIndex(dataverseName, datasetName, indexName);
}
@Override
public Index getIndex(MetadataTransactionContext ctx, String dataverseName, String datasetName, String indexName)
- throws MetadataException {
+ throws AlgebricksException {
// First look in the context to see if this transaction created the
// requested index itself (but the index is still uncommitted).
@@ -486,7 +452,7 @@
return index;
}
try {
- index = metadataNode.getIndex(ctx.getJobId(), dataverseName, datasetName, indexName);
+ index = metadataNode.getIndex(ctx.getTxnId(), dataverseName, datasetName, indexName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -499,18 +465,18 @@
}
@Override
- public void addNode(MetadataTransactionContext ctx, Node node) throws MetadataException {
+ public void addNode(MetadataTransactionContext ctx, Node node) throws AlgebricksException {
try {
- metadataNode.addNode(ctx.getJobId(), node);
+ metadataNode.addNode(ctx.getTxnId(), node);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
}
@Override
- public void addNodegroup(MetadataTransactionContext ctx, NodeGroup nodeGroup) throws MetadataException {
+ public void addNodegroup(MetadataTransactionContext ctx, NodeGroup nodeGroup) throws AlgebricksException {
try {
- metadataNode.addNodeGroup(ctx.getJobId(), nodeGroup);
+ metadataNode.addNodeGroup(ctx.getTxnId(), nodeGroup);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -519,10 +485,10 @@
@Override
public void dropNodegroup(MetadataTransactionContext ctx, String nodeGroupName, boolean failSilently)
- throws MetadataException {
+ throws AlgebricksException {
boolean dropped;
try {
- dropped = metadataNode.dropNodegroup(ctx.getJobId(), nodeGroupName, failSilently);
+ dropped = metadataNode.dropNodegroup(ctx.getTxnId(), nodeGroupName, failSilently);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -532,7 +498,7 @@
}
@Override
- public NodeGroup getNodegroup(MetadataTransactionContext ctx, String nodeGroupName) throws MetadataException {
+ public NodeGroup getNodegroup(MetadataTransactionContext ctx, String nodeGroupName) throws AlgebricksException {
// First look in the context to see if this transaction created the
// requested dataverse itself (but the dataverse is still uncommitted).
NodeGroup nodeGroup = ctx.getNodeGroup(nodeGroupName);
@@ -552,7 +518,7 @@
return nodeGroup;
}
try {
- nodeGroup = metadataNode.getNodeGroup(ctx.getJobId(), nodeGroupName);
+ nodeGroup = metadataNode.getNodeGroup(ctx.getTxnId(), nodeGroupName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -565,9 +531,9 @@
}
@Override
- public void addFunction(MetadataTransactionContext mdTxnCtx, Function function) throws MetadataException {
+ public void addFunction(MetadataTransactionContext mdTxnCtx, Function function) throws AlgebricksException {
try {
- metadataNode.addFunction(mdTxnCtx.getJobId(), function);
+ metadataNode.addFunction(mdTxnCtx.getTxnId(), function);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -576,9 +542,9 @@
@Override
public void dropFunction(MetadataTransactionContext ctx, FunctionSignature functionSignature)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.dropFunction(ctx.getJobId(), functionSignature);
+ metadataNode.dropFunction(ctx.getTxnId(), functionSignature);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -587,7 +553,7 @@
@Override
public Function getFunction(MetadataTransactionContext ctx, FunctionSignature functionSignature)
- throws MetadataException {
+ throws AlgebricksException {
// First look in the context to see if this transaction created the
// requested dataset itself (but the dataset is still uncommitted).
Function function = ctx.getFunction(functionSignature);
@@ -612,7 +578,7 @@
return function;
}
try {
- function = metadataNode.getFunction(ctx.getJobId(), functionSignature);
+ function = metadataNode.getFunction(ctx.getTxnId(), functionSignature);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -626,9 +592,10 @@
}
@Override
- public List<Function> getFunctions(MetadataTransactionContext ctx, String dataverseName) throws MetadataException {
+ public List<Function> getFunctions(MetadataTransactionContext ctx, String dataverseName)
+ throws AlgebricksException {
try {
- return metadataNode.getFunctions(ctx.getJobId(), dataverseName);
+ return metadataNode.getFunctions(ctx.getTxnId(), dataverseName);
} catch (RemoteException e) {
throw new MetadataException(e);
}
@@ -636,9 +603,9 @@
@Override
public void addFeedPolicy(MetadataTransactionContext mdTxnCtx, FeedPolicyEntity feedPolicy)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.addFeedPolicy(mdTxnCtx.getJobId(), feedPolicy);
+ metadataNode.addFeedPolicy(mdTxnCtx.getTxnId(), feedPolicy);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -646,16 +613,16 @@
}
@Override
- public void initializeDatasetIdFactory(MetadataTransactionContext ctx) throws MetadataException {
+ public void initializeDatasetIdFactory(MetadataTransactionContext ctx) throws AlgebricksException {
try {
- metadataNode.initializeDatasetIdFactory(ctx.getJobId());
+ metadataNode.initializeDatasetIdFactory(ctx.getTxnId());
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
}
@Override
- public int getMostRecentDatasetId() throws MetadataException {
+ public int getMostRecentDatasetId() throws AlgebricksException {
try {
return metadataNode.getMostRecentDatasetId();
} catch (RemoteException e) {
@@ -665,12 +632,12 @@
@Override
public List<Function> getDataverseFunctions(MetadataTransactionContext ctx, String dataverseName)
- throws MetadataException {
+ throws AlgebricksException {
List<Function> dataverseFunctions;
try {
// Assuming that the transaction can read its own writes on the
// metadata node.
- dataverseFunctions = metadataNode.getDataverseFunctions(ctx.getJobId(), dataverseName);
+ dataverseFunctions = metadataNode.getDataverseFunctions(ctx.getTxnId(), dataverseName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -681,9 +648,9 @@
@Override
public void dropAdapter(MetadataTransactionContext ctx, String dataverseName, String name)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.dropAdapter(ctx.getJobId(), dataverseName, name);
+ metadataNode.dropAdapter(ctx.getTxnId(), dataverseName, name);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -691,10 +658,10 @@
@Override
public DatasourceAdapter getAdapter(MetadataTransactionContext ctx, String dataverseName, String name)
- throws MetadataException {
+ throws AlgebricksException {
DatasourceAdapter adapter;
try {
- adapter = metadataNode.getAdapter(ctx.getJobId(), dataverseName, name);
+ adapter = metadataNode.getAdapter(ctx.getTxnId(), dataverseName, name);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -703,9 +670,9 @@
@Override
public void dropLibrary(MetadataTransactionContext ctx, String dataverseName, String libraryName)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.dropLibrary(ctx.getJobId(), dataverseName, libraryName);
+ metadataNode.dropLibrary(ctx.getTxnId(), dataverseName, libraryName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -714,12 +681,12 @@
@Override
public List<Library> getDataverseLibraries(MetadataTransactionContext ctx, String dataverseName)
- throws MetadataException {
+ throws AlgebricksException {
List<Library> dataverseLibaries;
try {
// Assuming that the transaction can read its own writes on the
// metadata node.
- dataverseLibaries = metadataNode.getDataverseLibraries(ctx.getJobId(), dataverseName);
+ dataverseLibaries = metadataNode.getDataverseLibraries(ctx.getTxnId(), dataverseName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -729,9 +696,9 @@
}
@Override
- public void addLibrary(MetadataTransactionContext ctx, Library library) throws MetadataException {
+ public void addLibrary(MetadataTransactionContext ctx, Library library) throws AlgebricksException {
try {
- metadataNode.addLibrary(ctx.getJobId(), library);
+ metadataNode.addLibrary(ctx.getTxnId(), library);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -740,10 +707,10 @@
@Override
public Library getLibrary(MetadataTransactionContext ctx, String dataverseName, String libraryName)
- throws MetadataException, RemoteException {
+ throws AlgebricksException, RemoteException {
Library library;
try {
- library = metadataNode.getLibrary(ctx.getJobId(), dataverseName, libraryName);
+ library = metadataNode.getLibrary(ctx.getTxnId(), dataverseName, libraryName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -772,11 +739,11 @@
@Override
public FeedPolicyEntity getFeedPolicy(MetadataTransactionContext ctx, String dataverse, String policyName)
- throws MetadataException {
+ throws AlgebricksException {
FeedPolicyEntity feedPolicy;
try {
- feedPolicy = metadataNode.getFeedPolicy(ctx.getJobId(), dataverse, policyName);
+ feedPolicy = metadataNode.getFeedPolicy(ctx.getTxnId(), dataverse, policyName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -784,10 +751,10 @@
}
@Override
- public Feed getFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws MetadataException {
+ public Feed getFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws AlgebricksException {
Feed feed;
try {
- feed = metadataNode.getFeed(ctx.getJobId(), dataverse, feedName);
+ feed = metadataNode.getFeed(ctx.getTxnId(), dataverse, feedName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -795,10 +762,10 @@
}
@Override
- public List<Feed> getFeeds(MetadataTransactionContext ctx, String dataverse) throws MetadataException {
+ public List<Feed> getFeeds(MetadataTransactionContext ctx, String dataverse) throws AlgebricksException {
List<Feed> feeds;
try {
- feeds = metadataNode.getFeeds(ctx.getJobId(), dataverse);
+ feeds = metadataNode.getFeeds(ctx.getTxnId(), dataverse);
} catch (RemoteException e) {
throw new MetadataException(e);
}
@@ -806,15 +773,15 @@
}
@Override
- public void dropFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws MetadataException {
+ public void dropFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws AlgebricksException {
Feed feed = null;
List<FeedConnection> feedConnections = null;
try {
- feed = metadataNode.getFeed(ctx.getJobId(), dataverse, feedName);
- feedConnections = metadataNode.getFeedConnections(ctx.getJobId(), dataverse, feedName);
- metadataNode.dropFeed(ctx.getJobId(), dataverse, feedName);
+ feed = metadataNode.getFeed(ctx.getTxnId(), dataverse, feedName);
+ feedConnections = metadataNode.getFeedConnections(ctx.getTxnId(), dataverse, feedName);
+ metadataNode.dropFeed(ctx.getTxnId(), dataverse, feedName);
for (FeedConnection feedConnection : feedConnections) {
- metadataNode.dropFeedConnection(ctx.getJobId(), dataverse, feedName, feedConnection.getDatasetName());
+ metadataNode.dropFeedConnection(ctx.getTxnId(), dataverse, feedName, feedConnection.getDatasetName());
ctx.dropFeedConnection(dataverse, feedName, feedConnection.getDatasetName());
}
} catch (RemoteException e) {
@@ -824,9 +791,9 @@
}
@Override
- public void addFeed(MetadataTransactionContext ctx, Feed feed) throws MetadataException {
+ public void addFeed(MetadataTransactionContext ctx, Feed feed) throws AlgebricksException {
try {
- metadataNode.addFeed(ctx.getJobId(), feed);
+ metadataNode.addFeed(ctx.getTxnId(), feed);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -835,9 +802,9 @@
@Override
public void addFeedConnection(MetadataTransactionContext ctx, FeedConnection feedConnection)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.addFeedConnection(ctx.getJobId(), feedConnection);
+ metadataNode.addFeedConnection(ctx.getTxnId(), feedConnection);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -846,9 +813,9 @@
@Override
public void dropFeedConnection(MetadataTransactionContext ctx, String dataverseName, String feedName,
- String datasetName) throws MetadataException {
+ String datasetName) throws AlgebricksException {
try {
- metadataNode.dropFeedConnection(ctx.getJobId(), dataverseName, feedName, datasetName);
+ metadataNode.dropFeedConnection(ctx.getTxnId(), dataverseName, feedName, datasetName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -857,9 +824,9 @@
@Override
public FeedConnection getFeedConnection(MetadataTransactionContext ctx, String dataverseName, String feedName,
- String datasetName) throws MetadataException {
+ String datasetName) throws AlgebricksException {
try {
- return metadataNode.getFeedConnection(ctx.getJobId(), dataverseName, feedName, datasetName);
+ return metadataNode.getFeedConnection(ctx.getTxnId(), dataverseName, feedName, datasetName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -867,9 +834,9 @@
@Override
public List<FeedConnection> getFeedConections(MetadataTransactionContext ctx, String dataverseName, String feedName)
- throws MetadataException {
+ throws AlgebricksException {
try {
- return metadataNode.getFeedConnections(ctx.getJobId(), dataverseName, feedName);
+ return metadataNode.getFeedConnections(ctx.getTxnId(), dataverseName, feedName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -877,10 +844,10 @@
@Override
public List<DatasourceAdapter> getDataverseAdapters(MetadataTransactionContext mdTxnCtx, String dataverse)
- throws MetadataException {
+ throws AlgebricksException {
List<DatasourceAdapter> dataverseAdapters;
try {
- dataverseAdapters = metadataNode.getDataverseAdapters(mdTxnCtx.getJobId(), dataverse);
+ dataverseAdapters = metadataNode.getDataverseAdapters(mdTxnCtx.getTxnId(), dataverse);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -889,11 +856,11 @@
@Override
public void dropFeedPolicy(MetadataTransactionContext mdTxnCtx, String dataverseName, String policyName)
- throws MetadataException {
+ throws AlgebricksException {
FeedPolicyEntity feedPolicy;
try {
- feedPolicy = metadataNode.getFeedPolicy(mdTxnCtx.getJobId(), dataverseName, policyName);
- metadataNode.dropFeedPolicy(mdTxnCtx.getJobId(), dataverseName, policyName);
+ feedPolicy = metadataNode.getFeedPolicy(mdTxnCtx.getTxnId(), dataverseName, policyName);
+ metadataNode.dropFeedPolicy(mdTxnCtx.getTxnId(), dataverseName, policyName);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -901,10 +868,10 @@
}
public List<FeedPolicyEntity> getDataversePolicies(MetadataTransactionContext mdTxnCtx, String dataverse)
- throws MetadataException {
+ throws AlgebricksException {
List<FeedPolicyEntity> dataverseFeedPolicies;
try {
- dataverseFeedPolicies = metadataNode.getDataversePolicies(mdTxnCtx.getJobId(), dataverse);
+ dataverseFeedPolicies = metadataNode.getDataversePolicies(mdTxnCtx.getTxnId(), dataverse);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -913,10 +880,10 @@
@Override
public List<ExternalFile> getDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset)
- throws MetadataException {
+ throws AlgebricksException {
List<ExternalFile> externalFiles;
try {
- externalFiles = metadataNode.getExternalFiles(mdTxnCtx.getJobId(), dataset);
+ externalFiles = metadataNode.getExternalFiles(mdTxnCtx.getTxnId(), dataset);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -924,18 +891,18 @@
}
@Override
- public void addExternalFile(MetadataTransactionContext ctx, ExternalFile externalFile) throws MetadataException {
+ public void addExternalFile(MetadataTransactionContext ctx, ExternalFile externalFile) throws AlgebricksException {
try {
- metadataNode.addExternalFile(ctx.getJobId(), externalFile);
+ metadataNode.addExternalFile(ctx.getTxnId(), externalFile);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
}
@Override
- public void dropExternalFile(MetadataTransactionContext ctx, ExternalFile externalFile) throws MetadataException {
+ public void dropExternalFile(MetadataTransactionContext ctx, ExternalFile externalFile) throws AlgebricksException {
try {
- metadataNode.dropExternalFile(ctx.getJobId(), externalFile.getDataverseName(),
+ metadataNode.dropExternalFile(ctx.getTxnId(), externalFile.getDataverseName(),
externalFile.getDatasetName(), externalFile.getFileNumber());
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
@@ -944,31 +911,31 @@
@Override
public ExternalFile getExternalFile(MetadataTransactionContext ctx, String dataverseName, String datasetName,
- Integer fileNumber) throws MetadataException {
+ Integer fileNumber) throws AlgebricksException {
ExternalFile file;
try {
- file = metadataNode.getExternalFile(ctx.getJobId(), dataverseName, datasetName, fileNumber);
+ file = metadataNode.getExternalFile(ctx.getTxnId(), dataverseName, datasetName, fileNumber);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
return file;
}
- //TODO: Optimize <-- use keys instead of object -->
+ // TODO: Optimize <-- use keys instead of object -->
@Override
public void dropDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.dropExternalFiles(mdTxnCtx.getJobId(), dataset);
+ metadataNode.dropExternalFiles(mdTxnCtx.getTxnId(), dataset);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
}
@Override
- public void updateDataset(MetadataTransactionContext ctx, Dataset dataset) throws MetadataException {
+ public void updateDataset(MetadataTransactionContext ctx, Dataset dataset) throws AlgebricksException {
try {
- metadataNode.updateDataset(ctx.getJobId(), dataset);
+ metadataNode.updateDataset(ctx.getTxnId(), dataset);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -977,11 +944,6 @@
ctx.addDataset(dataset);
}
- @Override
- public void cleanupTempDatasets() {
- cache.cleanupTempDatasets();
- }
-
public Dataset findDataset(MetadataTransactionContext ctx, String dataverseName, String datasetName) {
Dataset dataset = ctx.getDataset(dataverseName, datasetName);
if (dataset == null) {
@@ -992,9 +954,9 @@
@Override
public <T extends IExtensionMetadataEntity> void addEntity(MetadataTransactionContext mdTxnCtx, T entity)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.addEntity(mdTxnCtx.getJobId(), entity);
+ metadataNode.addEntity(mdTxnCtx.getTxnId(), entity);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -1002,9 +964,9 @@
@Override
public <T extends IExtensionMetadataEntity> void upsertEntity(MetadataTransactionContext mdTxnCtx, T entity)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.upsertEntity(mdTxnCtx.getJobId(), entity);
+ metadataNode.upsertEntity(mdTxnCtx.getTxnId(), entity);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -1012,9 +974,9 @@
@Override
public <T extends IExtensionMetadataEntity> void deleteEntity(MetadataTransactionContext mdTxnCtx, T entity)
- throws MetadataException {
+ throws AlgebricksException {
try {
- metadataNode.deleteEntity(mdTxnCtx.getJobId(), entity);
+ metadataNode.deleteEntity(mdTxnCtx.getTxnId(), entity);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
@@ -1022,9 +984,9 @@
@Override
public <T extends IExtensionMetadataEntity> List<T> getEntities(MetadataTransactionContext mdTxnCtx,
- IExtensionMetadataSearchKey searchKey) throws MetadataException {
+ IExtensionMetadataSearchKey searchKey) throws AlgebricksException {
try {
- return metadataNode.getEntities(mdTxnCtx.getJobId(), searchKey);
+ return metadataNode.getEntities(mdTxnCtx.getTxnId(), searchKey);
} catch (RemoteException e) {
throw new MetadataException(ErrorCode.REMOTE_EXCEPTION_WHEN_CALLING_METADATA_NODE, e);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
index 51cf988..368fc2a 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataNode.java
@@ -19,13 +19,14 @@
package org.apache.asterix.metadata;
+import static org.apache.asterix.common.transactions.ITransactionManager.AtomicityLevel;
+
import java.rmi.RemoteException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.asterix.common.api.IDatasetLifecycleManager;
@@ -34,16 +35,15 @@
import org.apache.asterix.common.config.DatasetConfig.IndexType;
import org.apache.asterix.common.dataflow.LSMIndexUtil;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.common.metadata.MetadataIndexImmutableProperties;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.IRecoveryManager.ResourceType;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
import org.apache.asterix.common.transactions.ImmutableDatasetId;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.ExternalFile;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.api.ExtensionMetadataDataset;
@@ -100,7 +100,7 @@
import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexModificationOperationCallback;
import org.apache.asterix.transaction.management.opcallbacks.UpsertOperationCallback;
import org.apache.asterix.transaction.management.service.transaction.DatasetIdFactory;
-import org.apache.asterix.transaction.management.service.transaction.TransactionContext;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.IBinaryComparator;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
@@ -112,12 +112,14 @@
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
import org.apache.hyracks.storage.common.IIndex;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
@@ -125,7 +127,6 @@
public class MetadataNode implements IMetadataNode {
private static final long serialVersionUID = 1L;
- private static final Logger LOGGER = Logger.getLogger(MetadataNode.class.getName());
private static final DatasetId METADATA_DATASET_ID =
new ImmutableDatasetId(MetadataPrimaryIndexes.PROPERTIES_METADATA.getDatasetId());
@@ -161,38 +162,30 @@
}
@Override
- public void beginTransaction(JobId transactionId) throws ACIDException, RemoteException {
- ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().beginTransaction(transactionId);
- txnCtx.setMetadataTransaction(true);
+ public void beginTransaction(TxnId transactionId) throws ACIDException, RemoteException {
+ TransactionOptions options = new TransactionOptions(AtomicityLevel.ATOMIC);
+ transactionSubsystem.getTransactionManager().beginTransaction(transactionId, options);
}
@Override
- public void commitTransaction(JobId jobId) throws RemoteException, ACIDException {
- ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- transactionSubsystem.getTransactionManager().commitTransaction(txnCtx, DatasetId.NULL, -1);
+ public void commitTransaction(TxnId txnId) throws RemoteException, ACIDException {
+ transactionSubsystem.getTransactionManager().commitTransaction(txnId);
}
@Override
- public void abortTransaction(JobId jobId) throws RemoteException, ACIDException {
- try {
- ITransactionContext txnCtx =
- transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- transactionSubsystem.getTransactionManager().abortTransaction(txnCtx, DatasetId.NULL, -1);
- } catch (ACIDException e) {
- LOGGER.log(Level.WARNING, "Exception aborting transaction", e);
- throw e;
- }
+ public void abortTransaction(TxnId txnId) throws RemoteException, ACIDException {
+ transactionSubsystem.getTransactionManager().abortTransaction(txnId);
}
@Override
- public void lock(JobId jobId, byte lockMode) throws ACIDException, RemoteException {
- ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
+ public void lock(TxnId txnId, byte lockMode) throws ACIDException, RemoteException {
+ ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(txnId);
transactionSubsystem.getLockManager().lock(METADATA_DATASET_ID, -1, lockMode, txnCtx);
}
@Override
- public void unlock(JobId jobId, byte lockMode) throws ACIDException, RemoteException {
- ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
+ public void unlock(TxnId txnId, byte lockMode) throws ACIDException, RemoteException {
+ ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(txnId);
transactionSubsystem.getLockManager().unlock(METADATA_DATASET_ID, -1, lockMode, txnCtx);
}
@@ -200,158 +193,158 @@
/**
* Add entity to index
*
- * @param jobId
+ * @param txnId
* @param entity
* @param tupleTranslator
* @param index
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- private <T> void addEntity(JobId jobId, T entity, IMetadataEntityTupleTranslator<T> tupleTranslator,
- IMetadataIndex index) throws MetadataException {
+ private <T> void addEntity(TxnId txnId, T entity, IMetadataEntityTupleTranslator<T> tupleTranslator,
+ IMetadataIndex index) throws AlgebricksException {
try {
ITupleReference tuple = tupleTranslator.getTupleFromMetadataEntity(entity);
- insertTupleIntoIndex(jobId, index, tuple);
+ insertTupleIntoIndex(txnId, index, tuple);
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
/**
* Upsert entity to index
*
- * @param jobId
+ * @param txnId
* @param entity
* @param tupleTranslator
* @param index
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- private <T> void upsertEntity(JobId jobId, T entity, IMetadataEntityTupleTranslator<T> tupleTranslator,
- IMetadataIndex index) throws MetadataException {
+ private <T> void upsertEntity(TxnId txnId, T entity, IMetadataEntityTupleTranslator<T> tupleTranslator,
+ IMetadataIndex index) throws AlgebricksException {
try {
ITupleReference tuple = tupleTranslator.getTupleFromMetadataEntity(entity);
- upsertTupleIntoIndex(jobId, index, tuple);
+ upsertTupleIntoIndex(txnId, index, tuple);
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
/**
* Delete entity from index
*
- * @param jobId
+ * @param txnId
* @param entity
* @param tupleTranslator
* @param index
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- private <T> void deleteEntity(JobId jobId, T entity, IMetadataEntityTupleTranslator<T> tupleTranslator,
- IMetadataIndex index) throws MetadataException {
+ private <T> void deleteEntity(TxnId txnId, T entity, IMetadataEntityTupleTranslator<T> tupleTranslator,
+ IMetadataIndex index) throws AlgebricksException {
try {
ITupleReference tuple = tupleTranslator.getTupleFromMetadataEntity(entity);
- deleteTupleFromIndex(jobId, index, tuple);
+ deleteTupleFromIndex(txnId, index, tuple);
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
/**
* retrieve all entities that matches the searchKey
*
- * @param jobId
+ * @param txnId
* @param searchKey
* @param tupleTranslator
* @param index
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- private <T> List<T> getEntities(JobId jobId, ITupleReference searchKey,
+ private <T> List<T> getEntities(TxnId txnId, ITupleReference searchKey,
IMetadataEntityTupleTranslator<T> tupleTranslator, IMetadataIndex index)
- throws MetadataException, RemoteException {
+ throws AlgebricksException, RemoteException {
try {
IValueExtractor<T> valueExtractor = new MetadataEntityValueExtractor<>(tupleTranslator);
List<T> results = new ArrayList<>();
- searchIndex(jobId, index, searchKey, valueExtractor, results);
+ searchIndex(txnId, index, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@SuppressWarnings("unchecked")
@Override
- public <T extends IExtensionMetadataEntity> void addEntity(JobId jobId, T entity)
- throws MetadataException, RemoteException {
+ public <T extends IExtensionMetadataEntity> void addEntity(TxnId txnId, T entity)
+ throws AlgebricksException, RemoteException {
ExtensionMetadataDataset<T> index = (ExtensionMetadataDataset<T>) extensionDatasets.get(entity.getDatasetId());
if (index == null) {
- throw new MetadataException("Metadata Extension Index: " + entity.getDatasetId() + " was not found");
+ throw new AlgebricksException("Metadata Extension Index: " + entity.getDatasetId() + " was not found");
}
IMetadataEntityTupleTranslator<T> tupleTranslator = index.getTupleTranslator();
- addEntity(jobId, entity, tupleTranslator, index);
+ addEntity(txnId, entity, tupleTranslator, index);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends IExtensionMetadataEntity> void upsertEntity(JobId jobId, T entity)
- throws MetadataException, RemoteException {
+ public <T extends IExtensionMetadataEntity> void upsertEntity(TxnId txnId, T entity)
+ throws AlgebricksException, RemoteException {
ExtensionMetadataDataset<T> index = (ExtensionMetadataDataset<T>) extensionDatasets.get(entity.getDatasetId());
if (index == null) {
- throw new MetadataException("Metadata Extension Index: " + entity.getDatasetId() + " was not found");
+ throw new AlgebricksException("Metadata Extension Index: " + entity.getDatasetId() + " was not found");
}
IMetadataEntityTupleTranslator<T> tupleTranslator = index.getTupleTranslator();
- upsertEntity(jobId, entity, tupleTranslator, index);
+ upsertEntity(txnId, entity, tupleTranslator, index);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends IExtensionMetadataEntity> void deleteEntity(JobId jobId, T entity)
- throws MetadataException, RemoteException {
+ public <T extends IExtensionMetadataEntity> void deleteEntity(TxnId txnId, T entity)
+ throws AlgebricksException, RemoteException {
ExtensionMetadataDataset<T> index = (ExtensionMetadataDataset<T>) extensionDatasets.get(entity.getDatasetId());
if (index == null) {
- throw new MetadataException("Metadata Extension Index: " + entity.getDatasetId() + " was not found");
+ throw new AlgebricksException("Metadata Extension Index: " + entity.getDatasetId() + " was not found");
}
IMetadataEntityTupleTranslator<T> tupleTranslator = index.getTupleTranslator();
- deleteEntity(jobId, entity, tupleTranslator, index);
+ deleteEntity(txnId, entity, tupleTranslator, index);
}
@SuppressWarnings("unchecked")
@Override
- public <T extends IExtensionMetadataEntity> List<T> getEntities(JobId jobId, IExtensionMetadataSearchKey searchKey)
- throws MetadataException, RemoteException {
+ public <T extends IExtensionMetadataEntity> List<T> getEntities(TxnId txnId, IExtensionMetadataSearchKey searchKey)
+ throws AlgebricksException, RemoteException {
ExtensionMetadataDataset<T> index =
(ExtensionMetadataDataset<T>) extensionDatasets.get(searchKey.getDatasetId());
if (index == null) {
- throw new MetadataException("Metadata Extension Index: " + searchKey.getDatasetId() + " was not found");
+ throw new AlgebricksException("Metadata Extension Index: " + searchKey.getDatasetId() + " was not found");
}
IMetadataEntityTupleTranslator<T> tupleTranslator = index.getTupleTranslator();
- return getEntities(jobId, searchKey.getSearchKey(), tupleTranslator, index);
+ return getEntities(txnId, searchKey.getSearchKey(), tupleTranslator, index);
}
@Override
- public void addDataverse(JobId jobId, Dataverse dataverse) throws MetadataException, RemoteException {
+ public void addDataverse(TxnId txnId, Dataverse dataverse) throws AlgebricksException, RemoteException {
try {
DataverseTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDataverseTupleTranslator(true);
ITupleReference tuple = tupleReaderWriter.getTupleFromMetadataEntity(dataverse);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATAVERSE_DATASET, tuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.DATAVERSE_DATASET, tuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException(
+ throw new AlgebricksException(
"A dataverse with this name " + dataverse.getDataverseName() + " already exists.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addDataset(JobId jobId, Dataset dataset) throws MetadataException, RemoteException {
+ public void addDataset(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException {
try {
// Insert into the 'dataset' dataset.
DatasetTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDatasetTupleTranslator(true);
ITupleReference datasetTuple = tupleReaderWriter.getTupleFromMetadataEntity(dataset);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
if (dataset.getDatasetType() == DatasetType.INTERNAL) {
// Add the primary index for the dataset.
@@ -360,256 +353,237 @@
dataset.getDatasetName(), IndexType.BTREE, id.getPrimaryKey(), id.getKeySourceIndicator(),
id.getPrimaryKeyType(), false, false, true, dataset.getPendingOp());
- addIndex(jobId, primaryIndex);
+ addIndex(txnId, primaryIndex);
}
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A dataset with this name " + dataset.getDatasetName()
+ throw new AlgebricksException("A dataset with this name " + dataset.getDatasetName()
+ " already exists in dataverse '" + dataset.getDataverseName() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addIndex(JobId jobId, Index index) throws MetadataException, RemoteException {
+ public void addIndex(TxnId txnId, Index index) throws AlgebricksException, RemoteException {
try {
- IndexTupleTranslator tupleWriter = tupleTranslatorProvider.getIndexTupleTranslator(jobId, this, true);
+ IndexTupleTranslator tupleWriter = tupleTranslatorProvider.getIndexTupleTranslator(txnId, this, true);
ITupleReference tuple = tupleWriter.getTupleFromMetadataEntity(index);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.INDEX_DATASET, tuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.INDEX_DATASET, tuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("An index with name '" + index.getIndexName() + "' already exists.", e);
+ throw new AlgebricksException("An index with name '" + index.getIndexName() + "' already exists.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addNode(JobId jobId, Node node) throws MetadataException, RemoteException {
+ public void addNode(TxnId txnId, Node node) throws AlgebricksException, RemoteException {
try {
NodeTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getNodeTupleTranslator(true);
ITupleReference tuple = tupleReaderWriter.getTupleFromMetadataEntity(node);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.NODE_DATASET, tuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.NODE_DATASET, tuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A node with name '" + node.getNodeName() + "' already exists.", e);
+ throw new AlgebricksException("A node with name '" + node.getNodeName() + "' already exists.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addNodeGroup(JobId jobId, NodeGroup nodeGroup) throws MetadataException, RemoteException {
+ public void addNodeGroup(TxnId txnId, NodeGroup nodeGroup) throws AlgebricksException, RemoteException {
try {
NodeGroupTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getNodeGroupTupleTranslator(true);
ITupleReference tuple = tupleReaderWriter.getTupleFromMetadataEntity(nodeGroup);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.NODEGROUP_DATASET, tuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.NODEGROUP_DATASET, tuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException(
+ throw new AlgebricksException(
"A nodegroup with name '" + nodeGroup.getNodeGroupName() + "' already exists.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addDatatype(JobId jobId, Datatype datatype) throws MetadataException, RemoteException {
+ public void addDatatype(TxnId txnId, Datatype datatype) throws AlgebricksException, RemoteException {
try {
DatatypeTupleTranslator tupleReaderWriter =
- tupleTranslatorProvider.getDataTypeTupleTranslator(jobId, this, true);
+ tupleTranslatorProvider.getDataTypeTupleTranslator(txnId, this, true);
ITupleReference tuple = tupleReaderWriter.getTupleFromMetadataEntity(datatype);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, tuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, tuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A datatype with name '" + datatype.getDatatypeName() + "' already exists.",
- e);
+ throw new AlgebricksException(
+ "A datatype with name '" + datatype.getDatatypeName() + "' already exists.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addFunction(JobId jobId, Function function) throws MetadataException, RemoteException {
+ public void addFunction(TxnId txnId, Function function) throws AlgebricksException, RemoteException {
try {
// Insert into the 'function' dataset.
FunctionTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFunctionTupleTranslator(true);
ITupleReference functionTuple = tupleReaderWriter.getTupleFromMetadataEntity(function);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, functionTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, functionTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A function with this name " + function.getName() + " and arity "
+ throw new AlgebricksException("A function with this name " + function.getName() + " and arity "
+ function.getArity() + " already exists in dataverse '" + function.getDataverseName() + "'.",
e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- private void insertTupleIntoIndex(JobId jobId, IMetadataIndex metadataIndex, ITupleReference tuple)
+ private void insertTupleIntoIndex(TxnId txnId, IMetadataIndex metadataIndex, ITupleReference tuple)
throws ACIDException, HyracksDataException {
- long resourceID = metadataIndex.getResourceId();
- String resourceName = metadataIndex.getFile().getRelativePath();
- ILSMIndex lsmIndex = (ILSMIndex) datasetLifecycleManager.get(resourceName);
- try {
- datasetLifecycleManager.open(resourceName);
-
- // prepare a Callback for logging
- IModificationOperationCallback modCallback =
- createIndexModificationCallback(jobId, resourceID, metadataIndex, lsmIndex, Operation.INSERT);
-
- ILSMIndexAccessor indexAccessor = lsmIndex.createAccessor(modCallback, NoOpOperationCallback.INSTANCE);
-
- ITransactionContext txnCtx =
- transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- txnCtx.setWriteTxn(true);
- txnCtx.registerIndexAndCallback(resourceID, lsmIndex, (AbstractOperationCallback) modCallback,
- metadataIndex.isPrimaryIndex());
-
- LSMIndexUtil.checkAndSetFirstLSN((AbstractLSMIndex) lsmIndex, transactionSubsystem.getLogManager());
-
- // TODO: fix exceptions once new BTree exception model is in hyracks.
- indexAccessor.forceInsert(tuple);
- //Manually complete the operation after the insert. This is to decrement the resource counters within the
- //index that determine how many tuples are still 'in-flight' within the index. Normally the log flusher
- //does this. The only exception is the index registered as the "primary" which we will let be decremented
- //by the job commit log event
- if (!((TransactionContext) txnCtx).getPrimaryIndexOpTracker().equals(lsmIndex.getOperationTracker())) {
- lsmIndex.getOperationTracker().completeOperation(lsmIndex, LSMOperationType.FORCE_MODIFICATION, null,
- modCallback);
- }
- } finally {
- datasetLifecycleManager.close(resourceName);
- }
+ modifyMetadataIndex(Operation.INSERT, txnId, metadataIndex, tuple);
}
- private void upsertTupleIntoIndex(JobId jobId, IMetadataIndex metadataIndex, ITupleReference tuple)
+ private void upsertTupleIntoIndex(TxnId txnId, IMetadataIndex metadataIndex, ITupleReference tuple)
throws ACIDException, HyracksDataException {
- long resourceId = metadataIndex.getResourceId();
+ modifyMetadataIndex(Operation.UPSERT, txnId, metadataIndex, tuple);
+ }
+
+ private void modifyMetadataIndex(Operation op, TxnId txnId, IMetadataIndex metadataIndex, ITupleReference tuple)
+ throws ACIDException, HyracksDataException {
String resourceName = metadataIndex.getFile().getRelativePath();
ILSMIndex lsmIndex = (ILSMIndex) datasetLifecycleManager.get(resourceName);
datasetLifecycleManager.open(resourceName);
try {
- // prepare a Callback for logging
- ITransactionContext txnCtx =
- transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- IModificationOperationCallback modCallback =
- new UpsertOperationCallback(metadataIndex.getDatasetId(), metadataIndex.getPrimaryKeyIndexes(),
- txnCtx, transactionSubsystem.getLockManager(), transactionSubsystem, resourceId,
- metadataStoragePartition, ResourceType.LSM_BTREE, Operation.UPSERT);
- ILSMIndexAccessor indexAccessor = lsmIndex.createAccessor(modCallback, NoOpOperationCallback.INSTANCE);
+ ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(txnId);
+ IModificationOperationCallback modCallback = createIndexModificationCallback(op, txnCtx, metadataIndex);
+ IIndexAccessParameters iap = new IndexAccessParameters(modCallback, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor indexAccessor = lsmIndex.createAccessor(iap);
txnCtx.setWriteTxn(true);
- txnCtx.registerIndexAndCallback(resourceId, lsmIndex, (AbstractOperationCallback) modCallback,
- metadataIndex.isPrimaryIndex());
+ txnCtx.register(metadataIndex.getResourceId(), lsmIndex, modCallback, metadataIndex.isPrimaryIndex());
LSMIndexUtil.checkAndSetFirstLSN((AbstractLSMIndex) lsmIndex, transactionSubsystem.getLogManager());
- indexAccessor.forceUpsert(tuple);
- //Manually complete the operation after the insert. This is to decrement the resource counters within the
- //index that determine how many tuples are still 'in-flight' within the index. Normally the log flusher
- //does this. The only exception is the index registered as the "primary" which we will let be decremented
- //by the job commit log event
- if (!((TransactionContext) txnCtx).getPrimaryIndexOpTracker().equals(lsmIndex.getOperationTracker())) {
- lsmIndex.getOperationTracker().completeOperation(lsmIndex, LSMOperationType.FORCE_MODIFICATION, null,
- modCallback);
+ switch (op) {
+ case INSERT:
+ indexAccessor.insert(tuple);
+ break;
+ case DELETE:
+ indexAccessor.delete(tuple);
+ break;
+ case UPSERT:
+ indexAccessor.upsert(tuple);
+ break;
+ default:
+ throw new IllegalStateException("Unknown operation type: " + op);
}
} finally {
datasetLifecycleManager.close(resourceName);
}
}
- private IModificationOperationCallback createIndexModificationCallback(JobId jobId, long resourceId,
- IMetadataIndex metadataIndex, ILSMIndex lsmIndex, Operation indexOp) throws ACIDException {
- ITransactionContext txnCtx = transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
-
- // Regardless of the index type (primary or secondary index), secondary index modification callback is given
- // This is still correct since metadata index operation doesn't require any lock from ConcurrentLockMgr and
- // The difference between primaryIndexModCallback and secondaryIndexModCallback is that primary index requires
- // locks and secondary index doesn't.
- return new SecondaryIndexModificationOperationCallback(metadataIndex.getDatasetId(),
- metadataIndex.getPrimaryKeyIndexes(), txnCtx, transactionSubsystem.getLockManager(),
- transactionSubsystem, resourceId, metadataStoragePartition, ResourceType.LSM_BTREE, indexOp);
+ private IModificationOperationCallback createIndexModificationCallback(Operation indexOp,
+ ITransactionContext txnCtx, IMetadataIndex metadataIndex) {
+ switch (indexOp) {
+ case INSERT:
+ case DELETE:
+ /*
+ * Regardless of the index type (primary or secondary index), secondary index modification
+ * callback is given. This is still correct since metadata index operation doesn't require
+ * any lock from ConcurrentLockMgr.
+ */
+ return new SecondaryIndexModificationOperationCallback(metadataIndex.getDatasetId(),
+ metadataIndex.getPrimaryKeyIndexes(), txnCtx, transactionSubsystem.getLockManager(),
+ transactionSubsystem, metadataIndex.getResourceId(), metadataStoragePartition,
+ ResourceType.LSM_BTREE, indexOp);
+ case UPSERT:
+ return new UpsertOperationCallback(metadataIndex.getDatasetId(), metadataIndex.getPrimaryKeyIndexes(),
+ txnCtx, transactionSubsystem.getLockManager(), transactionSubsystem,
+ metadataIndex.getResourceId(), metadataStoragePartition, ResourceType.LSM_BTREE, indexOp);
+ default:
+ throw new IllegalStateException("Unknown operation type: " + indexOp);
+ }
}
@Override
- public void dropDataverse(JobId jobId, String dataverseName) throws MetadataException, RemoteException {
+ public void dropDataverse(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException {
try {
- confirmDataverseCanBeDeleted(jobId, dataverseName);
+ confirmDataverseCanBeDeleted(txnId, dataverseName);
List<Dataset> dataverseDatasets;
Dataset ds;
- dataverseDatasets = getDataverseDatasets(jobId, dataverseName);
+ dataverseDatasets = getDataverseDatasets(txnId, dataverseName);
// Drop all datasets in this dataverse.
for (int i = 0; i < dataverseDatasets.size(); i++) {
ds = dataverseDatasets.get(i);
- dropDataset(jobId, dataverseName, ds.getDatasetName());
+ dropDataset(txnId, dataverseName, ds.getDatasetName());
}
- //After dropping datasets, drop datatypes
+ // After dropping datasets, drop datatypes
List<Datatype> dataverseDatatypes;
// As a side effect, acquires an S lock on the 'datatype' dataset
// on behalf of txnId.
- dataverseDatatypes = getDataverseDatatypes(jobId, dataverseName);
+ dataverseDatatypes = getDataverseDatatypes(txnId, dataverseName);
// Drop all types in this dataverse.
for (int i = 0; i < dataverseDatatypes.size(); i++) {
- forceDropDatatype(jobId, dataverseName, dataverseDatatypes.get(i).getDatatypeName());
+ forceDropDatatype(txnId, dataverseName, dataverseDatatypes.get(i).getDatatypeName());
}
// As a side effect, acquires an S lock on the 'Function' dataset
// on behalf of txnId.
- List<Function> dataverseFunctions = getDataverseFunctions(jobId, dataverseName);
+ List<Function> dataverseFunctions = getDataverseFunctions(txnId, dataverseName);
// Drop all functions in this dataverse.
for (Function function : dataverseFunctions) {
- dropFunction(jobId, new FunctionSignature(dataverseName, function.getName(), function.getArity()));
+ dropFunction(txnId, new FunctionSignature(dataverseName, function.getName(), function.getArity()));
}
// As a side effect, acquires an S lock on the 'Adapter' dataset
// on behalf of txnId.
- List<DatasourceAdapter> dataverseAdapters = getDataverseAdapters(jobId, dataverseName);
+ List<DatasourceAdapter> dataverseAdapters = getDataverseAdapters(txnId, dataverseName);
// Drop all functions in this dataverse.
for (DatasourceAdapter adapter : dataverseAdapters) {
- dropAdapter(jobId, dataverseName, adapter.getAdapterIdentifier().getName());
+ dropAdapter(txnId, dataverseName, adapter.getAdapterIdentifier().getName());
}
List<Feed> dataverseFeeds;
List<FeedConnection> feedConnections;
Feed feed;
- dataverseFeeds = getDataverseFeeds(jobId, dataverseName);
+ dataverseFeeds = getDataverseFeeds(txnId, dataverseName);
// Drop all feeds&connections in this dataverse.
for (int i = 0; i < dataverseFeeds.size(); i++) {
feed = dataverseFeeds.get(i);
- feedConnections = getFeedConnections(jobId, dataverseName, feed.getFeedName());
+ feedConnections = getFeedConnections(txnId, dataverseName, feed.getFeedName());
for (FeedConnection feedConnection : feedConnections) {
- dropFeedConnection(jobId, dataverseName, feed.getFeedName(), feedConnection.getDatasetName());
+ dropFeedConnection(txnId, dataverseName, feed.getFeedName(), feedConnection.getDatasetName());
}
- dropFeed(jobId, dataverseName, feed.getFeedName());
+ dropFeed(txnId, dataverseName, feed.getFeedName());
}
- List<FeedPolicyEntity> feedPolicies = getDataversePolicies(jobId, dataverseName);
+ List<FeedPolicyEntity> feedPolicies = getDataversePolicies(txnId, dataverseName);
if (feedPolicies != null && feedPolicies.size() > 0) {
// Drop all feed ingestion policies in this dataverse.
for (FeedPolicyEntity feedPolicy : feedPolicies) {
- dropFeedPolicy(jobId, dataverseName, feedPolicy.getPolicyName());
+ dropFeedPolicy(txnId, dataverseName, feedPolicy.getPolicyName());
}
}
@@ -617,30 +591,30 @@
ITupleReference searchKey = createTuple(dataverseName);
// As a side effect, acquires an S lock on the 'dataverse' dataset
// on behalf of txnId.
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATAVERSE_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATAVERSE_DATASET, tuple);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATAVERSE_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATAVERSE_DATASET, tuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop dataverse '" + dataverseName + "' because it doesn't exist.",
+ throw new AlgebricksException("Cannot drop dataverse '" + dataverseName + "' because it doesn't exist.",
e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropDataset(JobId jobId, String dataverseName, String datasetName)
- throws MetadataException, RemoteException {
- Dataset dataset = getDataset(jobId, dataverseName, datasetName);
+ public void dropDataset(TxnId txnId, String dataverseName, String datasetName)
+ throws AlgebricksException, RemoteException {
+ Dataset dataset = getDataset(txnId, dataverseName, datasetName);
if (dataset == null) {
- throw new MetadataException("Cannot drop dataset '" + datasetName + "' because it doesn't exist.");
+ throw new AlgebricksException("Cannot drop dataset '" + datasetName + "' because it doesn't exist.");
}
try {
// Delete entry from the 'datasets' dataset.
@@ -649,13 +623,13 @@
// lock on the 'dataset' dataset.
ITupleReference datasetTuple = null;
try {
- datasetTuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey);
+ datasetTuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey);
// Delete entry(s) from the 'indexes' dataset.
- List<Index> datasetIndexes = getDatasetIndexes(jobId, dataverseName, datasetName);
+ List<Index> datasetIndexes = getDatasetIndexes(txnId, dataverseName, datasetName);
if (datasetIndexes != null) {
for (Index index : datasetIndexes) {
- dropIndex(jobId, dataverseName, datasetName, index.getIndexName());
+ dropIndex(txnId, dataverseName, datasetName, index.getIndexName());
}
}
@@ -663,11 +637,11 @@
// Delete External Files
// As a side effect, acquires an S lock on the 'ExternalFile' dataset
// on behalf of txnId.
- List<ExternalFile> datasetFiles = getExternalFiles(jobId, dataset);
+ List<ExternalFile> datasetFiles = getExternalFiles(txnId, dataset);
if (datasetFiles != null && datasetFiles.size() > 0) {
// Drop all external files in this dataset.
for (ExternalFile file : datasetFiles) {
- dropExternalFile(jobId, dataverseName, file.getDatasetName(), file.getFileNumber());
+ dropExternalFile(txnId, dataverseName, file.getDatasetName(), file.getFileNumber());
}
}
}
@@ -676,44 +650,44 @@
// artifacts.
if (!hde.getComponent().equals(ErrorCode.HYRACKS)
|| hde.getErrorCode() != ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException(hde);
+ throw new AlgebricksException(hde);
}
} finally {
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
}
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropIndex(JobId jobId, String dataverseName, String datasetName, String indexName)
- throws MetadataException, RemoteException {
+ public void dropIndex(TxnId txnId, String dataverseName, String datasetName, String indexName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, datasetName, indexName);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'index' dataset.
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.INDEX_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.INDEX_DATASET, tuple);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.INDEX_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.INDEX_DATASET, tuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException(
+ throw new AlgebricksException(
"Cannot drop index '" + datasetName + "." + indexName + "' because it doesn't exist.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public boolean dropNodegroup(JobId jobId, String nodeGroupName, boolean failSilently)
- throws MetadataException, RemoteException {
- List<String> datasetNames = getDatasetNamesPartitionedOnThisNodeGroup(jobId, nodeGroupName);
+ public boolean dropNodegroup(TxnId txnId, String nodeGroupName, boolean failSilently)
+ throws AlgebricksException, RemoteException {
+ List<String> datasetNames = getDatasetNamesPartitionedOnThisNodeGroup(txnId, nodeGroupName);
if (!datasetNames.isEmpty()) {
if (failSilently) {
return false;
@@ -724,49 +698,49 @@
for (int i = 0; i < datasetNames.size(); i++) {
sb.append("\n" + (i + 1) + "- " + datasetNames.get(i) + ".");
}
- throw new MetadataException(sb.toString());
+ throw new AlgebricksException(sb.toString());
}
try {
ITupleReference searchKey = createTuple(nodeGroupName);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'nodegroup' dataset.
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.NODEGROUP_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.NODEGROUP_DATASET, tuple);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.NODEGROUP_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.NODEGROUP_DATASET, tuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
return true;
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop nodegroup '" + nodeGroupName + "' because it doesn't exist",
+ throw new AlgebricksException("Cannot drop nodegroup '" + nodeGroupName + "' because it doesn't exist",
e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropDatatype(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException {
+ public void dropDatatype(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException {
- confirmDatatypeIsUnused(jobId, dataverseName, datatypeName);
+ confirmDatatypeIsUnused(txnId, dataverseName, datatypeName);
// Delete the datatype entry, including all it's nested anonymous types.
try {
ITupleReference searchKey = createTuple(dataverseName, datatypeName);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'datatype' dataset.
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey);
// Get nested types
- List<String> nestedTypes = getNestedComplexDatatypeNamesForThisDatatype(jobId, dataverseName, datatypeName);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, tuple);
+ List<String> nestedTypes = getNestedComplexDatatypeNamesForThisDatatype(txnId, dataverseName, datatypeName);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, tuple);
for (String nestedType : nestedTypes) {
- Datatype dt = getDatatype(jobId, dataverseName, nestedType);
+ Datatype dt = getDatatype(txnId, dataverseName, nestedType);
if (dt != null && dt.getIsAnonymous()) {
- dropDatatype(jobId, dataverseName, dt.getDatatypeName());
+ dropDatatype(txnId, dataverseName, dt.getDatatypeName());
}
}
@@ -775,250 +749,223 @@
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop type '" + datatypeName + "' because it doesn't exist", e);
+ throw new AlgebricksException("Cannot drop type '" + datatypeName + "' because it doesn't exist", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- private void forceDropDatatype(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException {
+ private void forceDropDatatype(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, datatypeName);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'datatype' dataset.
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, tuple);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, tuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop type '" + datatypeName + "' because it doesn't exist", e);
+ throw new AlgebricksException("Cannot drop type '" + datatypeName + "' because it doesn't exist", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- private void deleteTupleFromIndex(JobId jobId, IMetadataIndex metadataIndex, ITupleReference tuple)
+ private void deleteTupleFromIndex(TxnId txnId, IMetadataIndex metadataIndex, ITupleReference tuple)
throws ACIDException, HyracksDataException {
- long resourceID = metadataIndex.getResourceId();
- String resourceName = metadataIndex.getFile().getRelativePath();
- ILSMIndex lsmIndex = (ILSMIndex) datasetLifecycleManager.get(resourceName);
- try {
- datasetLifecycleManager.open(resourceName);
- // prepare a Callback for logging
- IModificationOperationCallback modCallback =
- createIndexModificationCallback(jobId, resourceID, metadataIndex, lsmIndex, Operation.DELETE);
- ILSMIndexAccessor indexAccessor = lsmIndex.createAccessor(modCallback, NoOpOperationCallback.INSTANCE);
-
- ITransactionContext txnCtx =
- transactionSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- txnCtx.setWriteTxn(true);
- txnCtx.registerIndexAndCallback(resourceID, lsmIndex, (AbstractOperationCallback) modCallback,
- metadataIndex.isPrimaryIndex());
-
- LSMIndexUtil.checkAndSetFirstLSN((AbstractLSMIndex) lsmIndex, transactionSubsystem.getLogManager());
-
- indexAccessor.forceDelete(tuple);
- //Manually complete the operation after the insert. This is to decrement the resource counters within the
- //index that determine how many tuples are still 'in-flight' within the index. Normally the log flusher
- //does this. The only exception is the index registered as the "primary" which we will let be decremented
- //by the job commit log event
- if (!((TransactionContext) txnCtx).getPrimaryIndexOpTracker().equals(lsmIndex.getOperationTracker())) {
- lsmIndex.getOperationTracker().completeOperation(lsmIndex, LSMOperationType.FORCE_MODIFICATION, null,
- modCallback);
- }
- } finally {
- datasetLifecycleManager.close(resourceName);
- }
+ modifyMetadataIndex(Operation.DELETE, txnId, metadataIndex, tuple);
}
@Override
- public List<Dataverse> getDataverses(JobId jobId) throws MetadataException, RemoteException {
+ public List<Dataverse> getDataverses(TxnId txnId) throws AlgebricksException, RemoteException {
try {
DataverseTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDataverseTupleTranslator(false);
IValueExtractor<Dataverse> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Dataverse> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATAVERSE_DATASET, null, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATAVERSE_DATASET, null, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public Dataverse getDataverse(JobId jobId, String dataverseName) throws MetadataException, RemoteException {
+ public Dataverse getDataverse(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
DataverseTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDataverseTupleTranslator(false);
IValueExtractor<Dataverse> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Dataverse> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATAVERSE_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATAVERSE_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<Dataset> getDataverseDatasets(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException {
+ public List<Dataset> getDataverseDatasets(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
DatasetTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDatasetTupleTranslator(false);
IValueExtractor<Dataset> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Dataset> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<Feed> getDataverseFeeds(JobId jobId, String dataverseName) throws MetadataException, RemoteException {
+ public List<Feed> getDataverseFeeds(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
FeedTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedTupleTranslator(false);
IValueExtractor<Feed> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Feed> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<Library> getDataverseLibraries(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException {
+ public List<Library> getDataverseLibraries(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
LibraryTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getLibraryTupleTranslator(false);
IValueExtractor<Library> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Library> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- private List<Datatype> getDataverseDatatypes(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException {
+ private List<Datatype> getDataverseDatatypes(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
DatatypeTupleTranslator tupleReaderWriter =
- tupleTranslatorProvider.getDataTypeTupleTranslator(jobId, this, false);
+ tupleTranslatorProvider.getDataTypeTupleTranslator(txnId, this, false);
IValueExtractor<Datatype> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Datatype> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public Dataset getDataset(JobId jobId, String dataverseName, String datasetName)
- throws MetadataException, RemoteException {
+ public Dataset getDataset(TxnId txnId, String dataverseName, String datasetName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, datasetName);
DatasetTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDatasetTupleTranslator(false);
List<Dataset> results = new ArrayList<>();
IValueExtractor<Dataset> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- public List<Dataset> getAllDatasets(JobId jobId) throws MetadataException, RemoteException {
+ public List<Dataset> getAllDatasets(TxnId txnId) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = null;
DatasetTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDatasetTupleTranslator(false);
IValueExtractor<Dataset> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Dataset> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- public List<Datatype> getAllDatatypes(JobId jobId) throws MetadataException, RemoteException {
+ public List<Datatype> getAllDatatypes(TxnId txnId) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = null;
DatatypeTupleTranslator tupleReaderWriter =
- tupleTranslatorProvider.getDataTypeTupleTranslator(jobId, this, false);
+ tupleTranslatorProvider.getDataTypeTupleTranslator(txnId, this, false);
IValueExtractor<Datatype> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Datatype> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- private void confirmDataverseCanBeDeleted(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException {
- //If a dataset from a DIFFERENT dataverse
- //uses a type from this dataverse
- //throw an error
- List<Dataset> datasets = getAllDatasets(jobId);
+ private void confirmDataverseCanBeDeleted(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException {
+ // If a dataset from a DIFFERENT dataverse
+ // uses a type from this dataverse
+ // throw an error
+ List<Dataset> datasets = getAllDatasets(txnId);
for (Dataset set : datasets) {
if (set.getDataverseName().equals(dataverseName)) {
continue;
}
if (set.getItemTypeDataverseName().equals(dataverseName)) {
- throw new MetadataException("Cannot drop dataverse. Type " + dataverseName + "." + set.getItemTypeName()
- + " used by dataset " + set.getDataverseName() + "." + set.getDatasetName());
+ throw new AlgebricksException(
+ "Cannot drop dataverse. Type " + dataverseName + "." + set.getItemTypeName()
+ + " used by dataset " + set.getDataverseName() + "." + set.getDatasetName());
}
}
}
- private void confirmDatatypeIsUnused(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException {
- confirmDatatypeIsUnusedByDatatypes(jobId, dataverseName, datatypeName);
- confirmDatatypeIsUnusedByDatasets(jobId, dataverseName, datatypeName);
+ private void confirmDatatypeIsUnused(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException {
+ confirmDatatypeIsUnusedByDatatypes(txnId, dataverseName, datatypeName);
+ confirmDatatypeIsUnusedByDatasets(txnId, dataverseName, datatypeName);
}
- private void confirmDatatypeIsUnusedByDatasets(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException {
- //If any dataset uses this type, throw an error
- List<Dataset> datasets = getAllDatasets(jobId);
+ private void confirmDatatypeIsUnusedByDatasets(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException {
+ // If any dataset uses this type, throw an error
+ List<Dataset> datasets = getAllDatasets(txnId);
for (Dataset set : datasets) {
if (set.getItemTypeName().equals(datatypeName) && set.getItemTypeDataverseName().equals(dataverseName)) {
- throw new MetadataException("Cannot drop type " + dataverseName + "." + datatypeName
+ throw new AlgebricksException("Cannot drop type " + dataverseName + "." + datatypeName
+ " being used by dataset " + set.getDataverseName() + "." + set.getDatasetName());
}
}
}
- private void confirmDatatypeIsUnusedByDatatypes(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException {
- //If any datatype uses this type, throw an error
- //TODO: Currently this loads all types into memory. This will need to be fixed for large numbers of types
- Datatype dataTypeToBeDropped = getDatatype(jobId, dataverseName, datatypeName);
+ private void confirmDatatypeIsUnusedByDatatypes(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException {
+ // If any datatype uses this type, throw an error
+ // TODO: Currently this loads all types into memory. This will need to be fixed
+ // for large numbers of types
+ Datatype dataTypeToBeDropped = getDatatype(txnId, dataverseName, datatypeName);
assert dataTypeToBeDropped != null;
IAType typeToBeDropped = dataTypeToBeDropped.getDatatype();
- List<Datatype> datatypes = getAllDatatypes(jobId);
+ List<Datatype> datatypes = getAllDatatypes(txnId);
for (Datatype dataType : datatypes) {
- //skip types in different dataverses as well as the type to be dropped itself
+ // skip types in different dataverses as well as the type to be dropped itself
if (!dataType.getDataverseName().equals(dataverseName)
|| dataType.getDatatype().getTypeName().equals(datatypeName)) {
continue;
@@ -1026,16 +973,16 @@
AbstractComplexType recType = (AbstractComplexType) dataType.getDatatype();
if (recType.containsType(typeToBeDropped)) {
- throw new MetadataException("Cannot drop type " + dataverseName + "." + datatypeName
+ throw new AlgebricksException("Cannot drop type " + dataverseName + "." + datatypeName
+ " being used by type " + dataverseName + "." + recType.getTypeName());
}
}
}
- private List<String> getNestedComplexDatatypeNamesForThisDatatype(JobId jobId, String dataverseName,
- String datatypeName) throws MetadataException, RemoteException {
- //Return all field types that aren't builtin types
- Datatype parentType = getDatatype(jobId, dataverseName, datatypeName);
+ private List<String> getNestedComplexDatatypeNamesForThisDatatype(TxnId txnId, String dataverseName,
+ String datatypeName) throws AlgebricksException, RemoteException {
+ // Return all field types that aren't builtin types
+ Datatype parentType = getDatatype(txnId, dataverseName, datatypeName);
List<IAType> subTypes = null;
if (parentType.getDatatype().getTypeTag() == ATypeTag.OBJECT) {
@@ -1057,11 +1004,12 @@
return nestedTypes;
}
- public List<String> getDatasetNamesPartitionedOnThisNodeGroup(JobId jobId, String nodegroup)
- throws MetadataException, RemoteException {
- //this needs to scan the datasets and return the datasets that use this nodegroup
+ public List<String> getDatasetNamesPartitionedOnThisNodeGroup(TxnId txnId, String nodegroup)
+ throws AlgebricksException, RemoteException {
+ // this needs to scan the datasets and return the datasets that use this
+ // nodegroup
List<String> nodeGroupDatasets = new ArrayList<>();
- List<Dataset> datasets = getAllDatasets(jobId);
+ List<Dataset> datasets = getAllDatasets(txnId);
for (Dataset set : datasets) {
if (set.getNodeGroupName().equals(nodegroup)) {
nodeGroupDatasets.add(set.getDatasetName());
@@ -1072,117 +1020,117 @@
}
@Override
- public Index getIndex(JobId jobId, String dataverseName, String datasetName, String indexName)
- throws MetadataException, RemoteException {
+ public Index getIndex(TxnId txnId, String dataverseName, String datasetName, String indexName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, datasetName, indexName);
IndexTupleTranslator tupleReaderWriter =
- tupleTranslatorProvider.getIndexTupleTranslator(jobId, this, false);
+ tupleTranslatorProvider.getIndexTupleTranslator(txnId, this, false);
IValueExtractor<Index> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Index> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.INDEX_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.INDEX_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<Index> getDatasetIndexes(JobId jobId, String dataverseName, String datasetName)
- throws MetadataException, RemoteException {
+ public List<Index> getDatasetIndexes(TxnId txnId, String dataverseName, String datasetName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, datasetName);
IndexTupleTranslator tupleReaderWriter =
- tupleTranslatorProvider.getIndexTupleTranslator(jobId, this, false);
+ tupleTranslatorProvider.getIndexTupleTranslator(txnId, this, false);
IValueExtractor<Index> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Index> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.INDEX_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.INDEX_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public Datatype getDatatype(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException {
+ public Datatype getDatatype(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, datatypeName);
DatatypeTupleTranslator tupleReaderWriter =
- tupleTranslatorProvider.getDataTypeTupleTranslator(jobId, this, false);
+ tupleTranslatorProvider.getDataTypeTupleTranslator(txnId, this, false);
IValueExtractor<Datatype> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Datatype> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATATYPE_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public NodeGroup getNodeGroup(JobId jobId, String nodeGroupName) throws MetadataException, RemoteException {
+ public NodeGroup getNodeGroup(TxnId txnId, String nodeGroupName) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(nodeGroupName);
NodeGroupTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getNodeGroupTupleTranslator(false);
IValueExtractor<NodeGroup> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<NodeGroup> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.NODEGROUP_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.NODEGROUP_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public Function getFunction(JobId jobId, FunctionSignature functionSignature)
- throws MetadataException, RemoteException {
+ public Function getFunction(TxnId txnId, FunctionSignature functionSignature)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(functionSignature.getNamespace(), functionSignature.getName(),
"" + functionSignature.getArity());
FunctionTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFunctionTupleTranslator(false);
List<Function> results = new ArrayList<>();
IValueExtractor<Function> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<Function> getFunctions(JobId jobId, String dataverseName) throws MetadataException, RemoteException {
+ public List<Function> getFunctions(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
FunctionTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFunctionTupleTranslator(false);
List<Function> results = new ArrayList<>();
IValueExtractor<Function> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropFunction(JobId jobId, FunctionSignature functionSignature)
- throws MetadataException, RemoteException {
+ public void dropFunction(TxnId txnId, FunctionSignature functionSignature)
+ throws AlgebricksException, RemoteException {
- Function function = getFunction(jobId, functionSignature);
+ Function function = getFunction(txnId, functionSignature);
if (function == null) {
- throw new MetadataException(
+ throw new AlgebricksException(
"Cannot drop function '" + functionSignature.toString() + "' because it doesn't exist.");
}
try {
@@ -1192,29 +1140,29 @@
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'function' dataset.
ITupleReference functionTuple =
- getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, functionTuple);
+ getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, functionTuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("There is no function with the name " + functionSignature.getName()
+ throw new AlgebricksException("There is no function with the name " + functionSignature.getName()
+ " and arity " + functionSignature.getArity(), e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
- private ITupleReference getTupleToBeDeleted(JobId jobId, IMetadataIndex metadataIndex, ITupleReference searchKey)
- throws MetadataException, HyracksDataException, RemoteException {
+ private ITupleReference getTupleToBeDeleted(TxnId txnId, IMetadataIndex metadataIndex, ITupleReference searchKey)
+ throws AlgebricksException, HyracksDataException, RemoteException {
IValueExtractor<ITupleReference> valueExtractor = new TupleCopyValueExtractor(metadataIndex.getTypeTraits());
List<ITupleReference> results = new ArrayList<>();
- searchIndex(jobId, metadataIndex, searchKey, valueExtractor, results);
+ searchIndex(txnId, metadataIndex, searchKey, valueExtractor, results);
if (results.isEmpty()) {
// TODO: Temporarily a TreeIndexException to make it get caught by
// caller in the appropriate catch block.
@@ -1233,8 +1181,7 @@
String resourceName = index.getFile().toString();
IIndex indexInstance = datasetLifecycleManager.get(resourceName);
datasetLifecycleManager.open(resourceName);
- IIndexAccessor indexAccessor =
- indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = indexInstance.createAccessor(NoOpIndexAccessParameters.INSTANCE);
ITreeIndexCursor rangeCursor = (ITreeIndexCursor) indexAccessor.createSearchCursor(false);
RangePredicate rangePred = null;
@@ -1254,8 +1201,7 @@
index = MetadataPrimaryIndexes.DATASET_DATASET;
indexInstance = datasetLifecycleManager.get(resourceName);
datasetLifecycleManager.open(resourceName);
- indexAccessor =
- indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ indexAccessor = indexInstance.createAccessor(NoOpIndexAccessParameters.INSTANCE);
rangeCursor = (ITreeIndexCursor) indexAccessor.createSearchCursor(false);
rangePred = null;
@@ -1276,8 +1222,7 @@
index = MetadataPrimaryIndexes.INDEX_DATASET;
indexInstance = datasetLifecycleManager.get(resourceName);
datasetLifecycleManager.open(resourceName);
- indexAccessor =
- indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ indexAccessor = indexInstance.createAccessor(NoOpIndexAccessParameters.INSTANCE);
rangeCursor = (ITreeIndexCursor) indexAccessor.createSearchCursor(false);
rangePred = null;
@@ -1302,18 +1247,17 @@
return sb.toString();
}
- private <ResultType> void searchIndex(JobId jobId, IMetadataIndex index, ITupleReference searchKey,
+ private <ResultType> void searchIndex(TxnId txnId, IMetadataIndex index, ITupleReference searchKey,
IValueExtractor<ResultType> valueExtractor, List<ResultType> results)
- throws MetadataException, HyracksDataException, RemoteException {
+ throws AlgebricksException, HyracksDataException, RemoteException {
IBinaryComparatorFactory[] comparatorFactories = index.getKeyBinaryComparatorFactory();
if (index.getFile() == null) {
- throw new MetadataException("No file for Index " + index.getDataverseName() + "." + index.getIndexName());
+ throw new AlgebricksException("No file for Index " + index.getDataverseName() + "." + index.getIndexName());
}
String resourceName = index.getFile().getRelativePath();
IIndex indexInstance = datasetLifecycleManager.get(resourceName);
datasetLifecycleManager.open(resourceName);
- IIndexAccessor indexAccessor =
- indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = indexInstance.createAccessor(NoOpIndexAccessParameters.INSTANCE);
ITreeIndexCursor rangeCursor = (ITreeIndexCursor) indexAccessor.createSearchCursor(false);
IBinaryComparator[] searchCmps = null;
@@ -1332,7 +1276,7 @@
try {
while (rangeCursor.hasNext()) {
rangeCursor.next();
- ResultType result = valueExtractor.getValue(jobId, rangeCursor.getTuple());
+ ResultType result = valueExtractor.getValue(txnId, rangeCursor.getTuple());
if (result != null) {
results.add(result);
}
@@ -1344,15 +1288,14 @@
}
@Override
- public void initializeDatasetIdFactory(JobId jobId) throws MetadataException, RemoteException {
+ public void initializeDatasetIdFactory(TxnId txnId) throws AlgebricksException, RemoteException {
int mostRecentDatasetId = MetadataIndexImmutableProperties.FIRST_AVAILABLE_USER_DATASET_ID;
try {
String resourceName = MetadataPrimaryIndexes.DATASET_DATASET.getFile().getRelativePath();
IIndex indexInstance = datasetLifecycleManager.get(resourceName);
datasetLifecycleManager.open(resourceName);
try {
- IIndexAccessor indexAccessor =
- indexInstance.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = indexInstance.createAccessor(NoOpIndexAccessParameters.INSTANCE);
IIndexCursor rangeCursor = indexAccessor.createSearchCursor(false);
DatasetTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDatasetTupleTranslator(false);
@@ -1366,7 +1309,7 @@
while (rangeCursor.hasNext()) {
rangeCursor.next();
final ITupleReference ref = rangeCursor.getTuple();
- final Dataset ds = valueExtractor.getValue(jobId, ref);
+ final Dataset ds = valueExtractor.getValue(txnId, ref);
datasetId = ds.getDatasetId();
if (mostRecentDatasetId < datasetId) {
mostRecentDatasetId = datasetId;
@@ -1380,7 +1323,7 @@
}
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
DatasetIdFactory.initialize(mostRecentDatasetId);
@@ -1410,46 +1353,46 @@
}
@Override
- public List<Function> getDataverseFunctions(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException {
+ public List<Function> getDataverseFunctions(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
FunctionTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFunctionTupleTranslator(false);
IValueExtractor<Function> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<Function> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FUNCTION_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addAdapter(JobId jobId, DatasourceAdapter adapter) throws MetadataException, RemoteException {
+ public void addAdapter(TxnId txnId, DatasourceAdapter adapter) throws AlgebricksException, RemoteException {
try {
// Insert into the 'Adapter' dataset.
DatasourceAdapterTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getAdapterTupleTranslator(true);
ITupleReference adapterTuple = tupleReaderWriter.getTupleFromMetadataEntity(adapter);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, adapterTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, adapterTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A adapter with this name " + adapter.getAdapterIdentifier().getName()
+ throw new AlgebricksException("A adapter with this name " + adapter.getAdapterIdentifier().getName()
+ " already exists in dataverse '" + adapter.getAdapterIdentifier().getNamespace() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropAdapter(JobId jobId, String dataverseName, String adapterName)
- throws MetadataException, RemoteException {
- DatasourceAdapter adapter = getAdapter(jobId, dataverseName, adapterName);
+ public void dropAdapter(TxnId txnId, String dataverseName, String adapterName)
+ throws AlgebricksException, RemoteException {
+ DatasourceAdapter adapter = getAdapter(txnId, dataverseName, adapterName);
if (adapter == null) {
- throw new MetadataException("Cannot drop adapter '" + adapter + "' because it doesn't exist.");
+ throw new AlgebricksException("Cannot drop adapter '" + adapter + "' because it doesn't exist.");
}
try {
// Delete entry from the 'Adapter' dataset.
@@ -1457,125 +1400,125 @@
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'Adapter' dataset.
ITupleReference datasetTuple =
- getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, datasetTuple);
+ getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, datasetTuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop adapter '" + adapterName + " since it doesn't exist", e);
+ throw new AlgebricksException("Cannot drop adapter '" + adapterName + " since it doesn't exist", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public DatasourceAdapter getAdapter(JobId jobId, String dataverseName, String adapterName)
- throws MetadataException, RemoteException {
+ public DatasourceAdapter getAdapter(TxnId txnId, String dataverseName, String adapterName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, adapterName);
DatasourceAdapterTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getAdapterTupleTranslator(false);
List<DatasourceAdapter> results = new ArrayList<>();
IValueExtractor<DatasourceAdapter> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addCompactionPolicy(JobId jobId, CompactionPolicy compactionPolicy)
- throws MetadataException, RemoteException {
+ public void addCompactionPolicy(TxnId txnId, CompactionPolicy compactionPolicy)
+ throws AlgebricksException, RemoteException {
try {
// Insert into the 'CompactionPolicy' dataset.
CompactionPolicyTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getCompactionPolicyTupleTranslator(true);
ITupleReference compactionPolicyTuple = tupleReaderWriter.getTupleFromMetadataEntity(compactionPolicy);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.COMPACTION_POLICY_DATASET, compactionPolicyTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.COMPACTION_POLICY_DATASET, compactionPolicyTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A compcation policy with this name " + compactionPolicy.getPolicyName()
+ throw new AlgebricksException("A compcation policy with this name " + compactionPolicy.getPolicyName()
+ " already exists in dataverse '" + compactionPolicy.getPolicyName() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public CompactionPolicy getCompactionPolicy(JobId jobId, String dataverse, String policyName)
- throws MetadataException, RemoteException {
+ public CompactionPolicy getCompactionPolicy(TxnId txnId, String dataverse, String policyName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverse, policyName);
CompactionPolicyTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getCompactionPolicyTupleTranslator(false);
List<CompactionPolicy> results = new ArrayList<>();
IValueExtractor<CompactionPolicy> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.COMPACTION_POLICY_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.COMPACTION_POLICY_DATASET, searchKey, valueExtractor, results);
if (!results.isEmpty()) {
return results.get(0);
}
return null;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<DatasourceAdapter> getDataverseAdapters(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException {
+ public List<DatasourceAdapter> getDataverseAdapters(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName);
DatasourceAdapterTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getAdapterTupleTranslator(false);
IValueExtractor<DatasourceAdapter> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<DatasourceAdapter> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.DATASOURCE_ADAPTER_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addLibrary(JobId jobId, Library library) throws MetadataException, RemoteException {
+ public void addLibrary(TxnId txnId, Library library) throws AlgebricksException, RemoteException {
try {
// Insert into the 'Library' dataset.
LibraryTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getLibraryTupleTranslator(true);
ITupleReference libraryTuple = tupleReaderWriter.getTupleFromMetadataEntity(library);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, libraryTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.LIBRARY_DATASET, libraryTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A library with this name " + library.getDataverseName()
+ throw new AlgebricksException("A library with this name " + library.getDataverseName()
+ " already exists in dataverse '" + library.getDataverseName() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropLibrary(JobId jobId, String dataverseName, String libraryName)
- throws MetadataException, RemoteException {
- Library library = getLibrary(jobId, dataverseName, libraryName);
+ public void dropLibrary(TxnId txnId, String dataverseName, String libraryName)
+ throws AlgebricksException, RemoteException {
+ Library library = getLibrary(txnId, dataverseName, libraryName);
if (library == null) {
- throw new MetadataException("Cannot drop library '" + library + "' because it doesn't exist.");
+ throw new AlgebricksException("Cannot drop library '" + library + "' because it doesn't exist.");
}
try {
// Delete entry from the 'Library' dataset.
@@ -1583,317 +1526,319 @@
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'Adapter' dataset.
ITupleReference datasetTuple =
- getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, datasetTuple);
+ getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.LIBRARY_DATASET, datasetTuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop library '" + libraryName, e);
+ throw new AlgebricksException("Cannot drop library '" + libraryName, e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public Library getLibrary(JobId jobId, String dataverseName, String libraryName)
- throws MetadataException, RemoteException {
+ public Library getLibrary(TxnId txnId, String dataverseName, String libraryName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, libraryName);
LibraryTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getLibraryTupleTranslator(false);
List<Library> results = new ArrayList<>();
IValueExtractor<Library> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.LIBRARY_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public int getMostRecentDatasetId() throws MetadataException, RemoteException {
+ public int getMostRecentDatasetId() throws AlgebricksException, RemoteException {
return DatasetIdFactory.getMostRecentDatasetId();
}
@Override
- public void addFeedPolicy(JobId jobId, FeedPolicyEntity feedPolicy) throws MetadataException, RemoteException {
+ public void addFeedPolicy(TxnId txnId, FeedPolicyEntity feedPolicy) throws AlgebricksException, RemoteException {
try {
// Insert into the 'FeedPolicy' dataset.
FeedPolicyTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedPolicyTupleTranslator(true);
ITupleReference feedPolicyTuple = tupleReaderWriter.getTupleFromMetadataEntity(feedPolicy);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, feedPolicyTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, feedPolicyTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A feed policy with this name " + feedPolicy.getPolicyName()
+ throw new AlgebricksException("A feed policy with this name " + feedPolicy.getPolicyName()
+ " already exists in dataverse '" + feedPolicy.getPolicyName() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public FeedPolicyEntity getFeedPolicy(JobId jobId, String dataverse, String policyName)
- throws MetadataException, RemoteException {
+ public FeedPolicyEntity getFeedPolicy(TxnId txnId, String dataverse, String policyName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverse, policyName);
FeedPolicyTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedPolicyTupleTranslator(false);
List<FeedPolicyEntity> results = new ArrayList<>();
IValueExtractor<FeedPolicyEntity> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey, valueExtractor, results);
if (!results.isEmpty()) {
return results.get(0);
}
return null;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addFeedConnection(JobId jobId, FeedConnection feedConnection) throws MetadataException {
+ public void addFeedConnection(TxnId txnId, FeedConnection feedConnection) throws AlgebricksException {
try {
FeedConnectionTupleTranslator tupleReaderWriter = new FeedConnectionTupleTranslator(true);
ITupleReference feedConnTuple = tupleReaderWriter.getTupleFromMetadataEntity(feedConnection);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, feedConnTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, feedConnTuple);
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<FeedConnection> getFeedConnections(JobId jobId, String dataverseName, String feedName)
- throws MetadataException, RemoteException {
+ public List<FeedConnection> getFeedConnections(TxnId txnId, String dataverseName, String feedName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, feedName);
FeedConnectionTupleTranslator tupleReaderWriter = new FeedConnectionTupleTranslator(false);
List<FeedConnection> results = new ArrayList<>();
IValueExtractor<FeedConnection> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public FeedConnection getFeedConnection(JobId jobId, String dataverseName, String feedName, String datasetName)
- throws MetadataException, RemoteException {
+ public FeedConnection getFeedConnection(TxnId txnId, String dataverseName, String feedName, String datasetName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, feedName, datasetName);
FeedConnectionTupleTranslator tupleReaderWriter = new FeedConnectionTupleTranslator(false);
List<FeedConnection> results = new ArrayList<>();
IValueExtractor<FeedConnection> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, searchKey, valueExtractor, results);
if (!results.isEmpty()) {
return results.get(0);
}
return null;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropFeedConnection(JobId jobId, String dataverseName, String feedName, String datasetName)
- throws MetadataException, RemoteException {
+ public void dropFeedConnection(TxnId txnId, String dataverseName, String feedName, String datasetName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, feedName, datasetName);
ITupleReference tuple =
- getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, tuple);
+ getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.FEED_CONNECTION_DATASET, tuple);
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addFeed(JobId jobId, Feed feed) throws MetadataException, RemoteException {
+ public void addFeed(TxnId txnId, Feed feed) throws AlgebricksException, RemoteException {
try {
// Insert into the 'Feed' dataset.
FeedTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedTupleTranslator(true);
ITupleReference feedTuple = tupleReaderWriter.getTupleFromMetadataEntity(feed);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.FEED_DATASET, feedTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.FEED_DATASET, feedTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("A feed with this name " + feed.getFeedName()
+ throw new AlgebricksException("A feed with this name " + feed.getFeedName()
+ " already exists in dataverse '" + feed.getDataverseName() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public Feed getFeed(JobId jobId, String dataverse, String feedName) throws MetadataException, RemoteException {
+ public Feed getFeed(TxnId txnId, String dataverse, String feedName) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverse, feedName);
FeedTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedTupleTranslator(false);
List<Feed> results = new ArrayList<>();
IValueExtractor<Feed> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_DATASET, searchKey, valueExtractor, results);
if (!results.isEmpty()) {
return results.get(0);
}
return null;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<Feed> getFeeds(JobId jobId, String dataverse) throws MetadataException, RemoteException {
+ public List<Feed> getFeeds(TxnId txnId, String dataverse) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverse);
FeedTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedTupleTranslator(false);
List<Feed> results = new ArrayList<>();
IValueExtractor<Feed> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropFeed(JobId jobId, String dataverse, String feedName) throws MetadataException, RemoteException {
+ public void dropFeed(TxnId txnId, String dataverse, String feedName) throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverse, feedName);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'nodegroup' dataset.
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.FEED_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.FEED_DATASET, tuple);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.FEED_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.FEED_DATASET, tuple);
// TODO: Change this to be a BTree specific exception, e.g.,
// BTreeKeyDoesNotExistException.
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Cannot drop feed '" + feedName + "' because it doesn't exist", e);
+ throw new AlgebricksException("Cannot drop feed '" + feedName + "' because it doesn't exist", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropFeedPolicy(JobId jobId, String dataverseName, String policyName)
- throws MetadataException, RemoteException {
+ public void dropFeedPolicy(TxnId txnId, String dataverseName, String policyName)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverseName, policyName);
- ITupleReference tuple = getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, tuple);
+ ITupleReference tuple = getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, tuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Unknown feed policy " + policyName, e);
+ throw new AlgebricksException("Unknown feed policy " + policyName, e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<FeedPolicyEntity> getDataversePolicies(JobId jobId, String dataverse)
- throws MetadataException, RemoteException {
+ public List<FeedPolicyEntity> getDataversePolicies(TxnId txnId, String dataverse)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataverse);
FeedPolicyTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getFeedPolicyTupleTranslator(false);
IValueExtractor<FeedPolicyEntity> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<FeedPolicyEntity> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.FEED_POLICY_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void addExternalFile(JobId jobId, ExternalFile externalFile) throws MetadataException, RemoteException {
+ public void addExternalFile(TxnId txnId, ExternalFile externalFile) throws AlgebricksException, RemoteException {
try {
// Insert into the 'externalFiles' dataset.
ExternalFileTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getExternalFileTupleTranslator(true);
ITupleReference externalFileTuple = tupleReaderWriter.getTupleFromMetadataEntity(externalFile);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, externalFileTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, externalFileTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS) && e.getErrorCode() == ErrorCode.DUPLICATE_KEY) {
- throw new MetadataException("An externalFile with this number " + externalFile.getFileNumber()
+ throw new AlgebricksException("An externalFile with this number " + externalFile.getFileNumber()
+ " already exists in dataset '" + externalFile.getDatasetName() + "' in dataverse '"
+ externalFile.getDataverseName() + "'.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public List<ExternalFile> getExternalFiles(JobId jobId, Dataset dataset) throws MetadataException, RemoteException {
+ public List<ExternalFile> getExternalFiles(TxnId txnId, Dataset dataset)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createTuple(dataset.getDataverseName(), dataset.getDatasetName());
ExternalFileTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getExternalFileTupleTranslator(false);
IValueExtractor<ExternalFile> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<ExternalFile> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, searchKey, valueExtractor, results);
return results;
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropExternalFile(JobId jobId, String dataverseName, String datasetName, int fileNumber)
- throws MetadataException, RemoteException {
+ public void dropExternalFile(TxnId txnId, String dataverseName, String datasetName, int fileNumber)
+ throws AlgebricksException, RemoteException {
try {
// Delete entry from the 'ExternalFile' dataset.
ITupleReference searchKey = createExternalFileSearchTuple(dataverseName, datasetName, fileNumber);
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'ExternalFile' dataset.
ITupleReference datasetTuple =
- getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, datasetTuple);
+ getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, datasetTuple);
} catch (HyracksDataException e) {
if (e.getComponent().equals(ErrorCode.HYRACKS)
&& e.getErrorCode() == ErrorCode.UPDATE_OR_DELETE_NON_EXISTENT_KEY) {
- throw new MetadataException("Couldn't drop externalFile.", e);
+ throw new AlgebricksException("Couldn't drop externalFile.", e);
} else {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
} catch (ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void dropExternalFiles(JobId jobId, Dataset dataset) throws MetadataException, RemoteException {
- List<ExternalFile> files = getExternalFiles(jobId, dataset);
- //loop through files and delete them
+ public void dropExternalFiles(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException {
+ List<ExternalFile> files = getExternalFiles(txnId, dataset);
+ // loop through files and delete them
for (int i = 0; i < files.size(); i++) {
- dropExternalFile(jobId, files.get(i).getDataverseName(), files.get(i).getDatasetName(),
+ dropExternalFile(txnId, files.get(i).getDataverseName(), files.get(i).getDatasetName(),
files.get(i).getFileNumber());
}
}
- // This method is used to create a search tuple for external data file since the search tuple has an int value
+ // This method is used to create a search tuple for external data file since the
+ // search tuple has an int value
@SuppressWarnings("unchecked")
public ITupleReference createExternalFileSearchTuple(String dataverseName, String datasetName, int fileNumber)
throws HyracksDataException {
@@ -1905,17 +1850,17 @@
AMutableString aString = new AMutableString("");
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(3);
- //dataverse field
+ // dataverse field
aString.setValue(dataverseName);
stringSerde.serialize(aString, tupleBuilder.getDataOutput());
tupleBuilder.addFieldEndOffset();
- //dataset field
+ // dataset field
aString.setValue(datasetName);
stringSerde.serialize(aString, tupleBuilder.getDataOutput());
tupleBuilder.addFieldEndOffset();
- //file number field
+ // file number field
intSerde.serialize(new AInt32(fileNumber), tupleBuilder.getDataOutput());
tupleBuilder.addFieldEndOffset();
@@ -1925,26 +1870,26 @@
}
@Override
- public ExternalFile getExternalFile(JobId jobId, String dataverseName, String datasetName, Integer fileNumber)
- throws MetadataException, RemoteException {
+ public ExternalFile getExternalFile(TxnId txnId, String dataverseName, String datasetName, Integer fileNumber)
+ throws AlgebricksException, RemoteException {
try {
ITupleReference searchKey = createExternalFileSearchTuple(dataverseName, datasetName, fileNumber);
ExternalFileTupleTranslator tupleReaderWriter =
tupleTranslatorProvider.getExternalFileTupleTranslator(false);
IValueExtractor<ExternalFile> valueExtractor = new MetadataEntityValueExtractor<>(tupleReaderWriter);
List<ExternalFile> results = new ArrayList<>();
- searchIndex(jobId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, searchKey, valueExtractor, results);
+ searchIndex(txnId, MetadataPrimaryIndexes.EXTERNAL_FILE_DATASET, searchKey, valueExtractor, results);
if (results.isEmpty()) {
return null;
}
return results.get(0);
} catch (HyracksDataException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
@Override
- public void updateDataset(JobId jobId, Dataset dataset) throws MetadataException, RemoteException {
+ public void updateDataset(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException {
try {
// This method will delete previous entry of the dataset and insert the new one
// Delete entry from the 'datasets' dataset.
@@ -1953,15 +1898,15 @@
// Searches the index for the tuple to be deleted. Acquires an S
// lock on the 'dataset' dataset.
ITupleReference datasetTuple =
- getTupleToBeDeleted(jobId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey);
- deleteTupleFromIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
+ getTupleToBeDeleted(txnId, MetadataPrimaryIndexes.DATASET_DATASET, searchKey);
+ deleteTupleFromIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
// Previous tuple was deleted
// Insert into the 'dataset' dataset.
DatasetTupleTranslator tupleReaderWriter = tupleTranslatorProvider.getDatasetTupleTranslator(true);
datasetTuple = tupleReaderWriter.getTupleFromMetadataEntity(dataset);
- insertTupleIntoIndex(jobId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
+ insertTupleIntoIndex(txnId, MetadataPrimaryIndexes.DATASET_DATASET, datasetTuple);
} catch (HyracksDataException | ACIDException e) {
- throw new MetadataException(e);
+ throw new AlgebricksException(e);
}
}
-}
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java
index 72285d0..406b3d6 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/MetadataTransactionContext.java
@@ -22,7 +22,7 @@
import java.util.ArrayList;
import org.apache.asterix.common.functions.FunctionSignature;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.dataset.adapter.AdapterIdentifier;
import org.apache.asterix.metadata.entities.CompactionPolicy;
import org.apache.asterix.metadata.entities.Dataset;
@@ -68,14 +68,14 @@
protected MetadataCache droppedCache = new MetadataCache();
protected ArrayList<MetadataLogicalOperation> opLog = new ArrayList<>();
- private final JobId jobId;
+ private final TxnId txnId;
- public MetadataTransactionContext(JobId jobId) {
- this.jobId = jobId;
+ public MetadataTransactionContext(TxnId txnId) {
+ this.txnId = txnId;
}
- public JobId getJobId() {
- return jobId;
+ public TxnId getTxnId() {
+ return txnId;
}
public void addDataverse(Dataverse dataverse) {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IClusterManager.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IClusterManager.java
index 4acd673..8459f70 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IClusterManager.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IClusterManager.java
@@ -29,15 +29,15 @@
/**
* @param node
- * @throws AsterixException
+ * @throws Exception
*/
- public void addNode(ICcApplicationContext appCtx, Node node) throws AsterixException;
+ public void addNode(ICcApplicationContext appCtx, Node node) throws Exception;
/**
* @param node
- * @throws AsterixException
+ * @throws Exception
*/
- public void removeNode(Node node) throws AsterixException;
+ public void removeNode(Node node) throws Exception;
/**
* @param subscriber
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
index fbeb353..cd84256 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataEntityTupleTranslator.java
@@ -19,11 +19,10 @@
package org.apache.asterix.metadata.api;
-import java.io.IOException;
import java.io.Serializable;
import java.rmi.RemoteException;
-import org.apache.asterix.common.exceptions.MetadataException;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -36,19 +35,19 @@
public interface IMetadataEntityTupleTranslator<T> extends Serializable {
/**
- * Transforms a metadata entity of type T from a given tuple to a Java
- * object (deserializing the appropriate field(s) in the tuple as
- * necessary).
+ * Transforms a metadata entity of type T from a given tuple to a Java object
+ * (deserializing the appropriate field(s) in the tuple as necessary).
*
* @param tuple
- * Tuple containing a serialized representation of a metadata
- * entity of type T.
+ * Tuple containing a serialized representation of a metadata entity
+ * of type T.
* @return A new instance of a metadata entity of type T.
- * @throws MetadataException
- * @throws IOException
+ * @throws AlgebricksException
+ * @throws HyracksDataException
+ * @throws RemoteException
*/
- public T getMetadataEntityFromTuple(ITupleReference tuple)
- throws MetadataException, HyracksDataException, RemoteException;
+ T getMetadataEntityFromTuple(ITupleReference tuple)
+ throws AlgebricksException, HyracksDataException, RemoteException;
/**
* Serializes the given metadata entity of type T into an appropriate tuple
@@ -56,7 +55,8 @@
*
* @param metadataEntity
* Metadata entity to be written into a tuple.
+ * @throws AlgebricksException
* @throws HyracksDataException
*/
- public ITupleReference getTupleFromMetadataEntity(T metadataEntity) throws MetadataException, HyracksDataException;
+ ITupleReference getTupleFromMetadataEntity(T metadataEntity) throws AlgebricksException, HyracksDataException;
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
index 88153a3..b2d0d3e 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataManager.java
@@ -23,7 +23,6 @@
import java.util.List;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.common.metadata.IMetadataBootstrap;
import org.apache.asterix.external.indexing.ExternalFile;
@@ -41,6 +40,7 @@
import org.apache.asterix.metadata.entities.Library;
import org.apache.asterix.metadata.entities.Node;
import org.apache.asterix.metadata.entities.NodeGroup;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
/**
* A metadata manager provides user access to Asterix metadata (e.g., types,
@@ -86,8 +86,8 @@
void abortTransaction(MetadataTransactionContext ctx) throws ACIDException, RemoteException;
/**
- * Locks the metadata in given mode. The lock acquisition is delegated to
- * the metadata node. This method blocks until the lock can be acquired.
+ * Locks the metadata in given mode. The lock acquisition is delegated to the
+ * metadata node. This method blocks until the lock can be acquired.
*
* @param ctx
* MetadataTransactionContext of an active metadata transaction.
@@ -115,10 +115,10 @@
* MetadataTransactionContext of an active metadata transaction.
* @param dataverse
* Dataverse instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse already exists.
*/
- void addDataverse(MetadataTransactionContext ctx, Dataverse dataverse) throws MetadataException;
+ void addDataverse(MetadataTransactionContext ctx, Dataverse dataverse) throws AlgebricksException;
/**
* Retrieves all dataverses
@@ -126,9 +126,9 @@
* @param ctx
* MetadataTransactionContext of an active metadata transaction.
* @return A list of dataverse instances.
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- List<Dataverse> getDataverses(MetadataTransactionContext ctx) throws MetadataException;
+ List<Dataverse> getDataverses(MetadataTransactionContext ctx) throws AlgebricksException;
/**
* Retrieves a dataverse with given name.
@@ -138,10 +138,10 @@
* @param dataverseName
* Name of the dataverse to retrieve.
* @return A dataverse instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist.
*/
- Dataverse getDataverse(MetadataTransactionContext ctx, String dataverseName) throws MetadataException;
+ Dataverse getDataverse(MetadataTransactionContext ctx, String dataverseName) throws AlgebricksException;
/**
* Retrieves all datasets belonging to the given dataverse.
@@ -151,10 +151,10 @@
* @param dataverseName
* Name of the dataverse of which to find all datasets.
* @return A list of dataset instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist.
*/
- List<Dataset> getDataverseDatasets(MetadataTransactionContext ctx, String dataverseName) throws MetadataException;
+ List<Dataset> getDataverseDatasets(MetadataTransactionContext ctx, String dataverseName) throws AlgebricksException;
/**
* Deletes the dataverse with given name, and all it's associated datasets,
@@ -163,10 +163,10 @@
* @param ctx
* MetadataTransactionContext of an active metadata transaction.
* @return A list of dataset instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist.
*/
- void dropDataverse(MetadataTransactionContext ctx, String dataverseName) throws MetadataException;
+ void dropDataverse(MetadataTransactionContext ctx, String dataverseName) throws AlgebricksException;
/**
* Inserts a new dataset into the metadata.
@@ -175,10 +175,10 @@
* MetadataTransactionContext of an active metadata transaction.
* @param dataset
* Dataset instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset already exists.
*/
- void addDataset(MetadataTransactionContext ctx, Dataset dataset) throws MetadataException;
+ void addDataset(MetadataTransactionContext ctx, Dataset dataset) throws AlgebricksException;
/**
* Retrieves a dataset within a given dataverse.
@@ -190,11 +190,11 @@
* @param datasetName
* Name of dataset to be retrieved.
* @return A dataset instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset does not exist.
*/
Dataset getDataset(MetadataTransactionContext ctx, String dataverseName, String datasetName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Retrieves all indexes of a dataset.
@@ -206,11 +206,11 @@
* @param datasetName
* Name of dataset for which to retrieve all indexes.
* @return A list of Index instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset and/or dataverse does not exist.
*/
List<Index> getDatasetIndexes(MetadataTransactionContext ctx, String dataverseName, String datasetName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Deletes the dataset with given name, and all it's associated indexes.
@@ -221,10 +221,11 @@
* Name of dataverse which holds the given dataset.
* @param datasetName
* Name of dataset to delete.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset and/or dataverse does not exist.
*/
- void dropDataset(MetadataTransactionContext ctx, String dataverseName, String datasetName) throws MetadataException;
+ void dropDataset(MetadataTransactionContext ctx, String dataverseName, String datasetName)
+ throws AlgebricksException;
/**
* Inserts an index into the metadata. The index itself knows its name, and
@@ -234,10 +235,10 @@
* MetadataTransactionContext of an active metadata transaction.
* @param index
* Index instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index already exists.
*/
- void addIndex(MetadataTransactionContext ctx, Index index) throws MetadataException;
+ void addIndex(MetadataTransactionContext ctx, Index index) throws AlgebricksException;
/**
* Retrieves the index with given name, in given dataverse and dataset.
@@ -251,11 +252,11 @@
* @param indexName
* Name of the index to retrieve.
* @return An Index instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index does not exist.
*/
Index getIndex(MetadataTransactionContext ctx, String dataverseName, String datasetName, String indexName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Deletes the index with given name, in given dataverse and dataset.
@@ -268,11 +269,11 @@
* Name of the dataset holding the index.
* @param indexName
* Name of the index to retrieve.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index does not exist.
*/
void dropIndex(MetadataTransactionContext ctx, String dataverseName, String datasetName, String indexName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Inserts a datatype.
@@ -281,10 +282,10 @@
* MetadataTransactionContext of an active metadata transaction.
* @param datatype
* Datatype instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the datatype already exists.
*/
- void addDatatype(MetadataTransactionContext ctx, Datatype datatype) throws MetadataException;
+ void addDatatype(MetadataTransactionContext ctx, Datatype datatype) throws AlgebricksException;
/**
* Retrieves the datatype with given name in given dataverse.
@@ -296,11 +297,11 @@
* @param datatypeName
* Name of datatype to be retrieved.
* @return A datatype instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the datatype does not exist.
*/
Datatype getDatatype(MetadataTransactionContext ctx, String dataverseName, String datatypeName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Deletes the given datatype in given dataverse.
@@ -311,12 +312,12 @@
* Name of dataverse holding the datatype.
* @param datatypeName
* Name of datatype to be deleted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if there are still datasets using the type to be
* deleted.
*/
void dropDatatype(MetadataTransactionContext ctx, String dataverseName, String datatypeName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Inserts a node group.
@@ -325,10 +326,10 @@
* MetadataTransactionContext of an active metadata transaction.
* @param nodeGroup
* Node group instance to insert.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the node group already exists.
*/
- void addNodegroup(MetadataTransactionContext ctx, NodeGroup nodeGroup) throws MetadataException;
+ void addNodegroup(MetadataTransactionContext ctx, NodeGroup nodeGroup) throws AlgebricksException;
/**
* Retrieves a node group.
@@ -337,10 +338,10 @@
* MetadataTransactionContext of an active metadata transaction.
* @param nodeGroupName
* Name of node group to be retrieved.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the node group does not exist.
*/
- NodeGroup getNodegroup(MetadataTransactionContext ctx, String nodeGroupName) throws MetadataException;
+ NodeGroup getNodegroup(MetadataTransactionContext ctx, String nodeGroupName) throws AlgebricksException;
/**
* Deletes a node group.
@@ -350,13 +351,14 @@
* @param nodeGroupName
* Name of node group to be deleted.
* @param failSilently
- * true means it's a no-op if the node group cannot be dropped; false means it will throw an exception.
- * @throws MetadataException
+ * true means it's a no-op if the node group cannot be dropped; false
+ * means it will throw an exception.
+ * @throws AlgebricksException
* For example, there are still datasets partitioned on the node
* group to be deleted.
*/
void dropNodegroup(MetadataTransactionContext ctx, String nodeGroupName, boolean failSilently)
- throws MetadataException;
+ throws AlgebricksException;
/**
* Inserts a node (machine).
@@ -365,20 +367,20 @@
* MetadataTransactionContext of an active metadata transaction.
* @param node
* Node instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the node already exists.
*/
- void addNode(MetadataTransactionContext ctx, Node node) throws MetadataException;
+ void addNode(MetadataTransactionContext ctx, Node node) throws AlgebricksException;
/**
* @param mdTxnCtx
* MetadataTransactionContext of an active metadata transaction.
* @param function
- * An instance of type Function that represents the function
- * being added
- * @throws MetadataException
+ * An instance of type Function that represents the function being
+ * added
+ * @throws AlgebricksException
*/
- void addFunction(MetadataTransactionContext mdTxnCtx, Function function) throws MetadataException;
+ void addFunction(MetadataTransactionContext mdTxnCtx, Function function) throws AlgebricksException;
/**
* @param ctx
@@ -386,21 +388,22 @@
* @param functionSignature
* the functions signature (unique to the function)
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- Function getFunction(MetadataTransactionContext ctx, FunctionSignature functionSignature) throws MetadataException;
+ Function getFunction(MetadataTransactionContext ctx, FunctionSignature functionSignature)
+ throws AlgebricksException;
- List<Function> getFunctions(MetadataTransactionContext ctx, String dataverseName) throws MetadataException;
+ List<Function> getFunctions(MetadataTransactionContext ctx, String dataverseName) throws AlgebricksException;
/**
* @param ctx
* MetadataTransactionContext of an active metadata transaction.
* @param functionSignature
* the functions signature (unique to the function)
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void dropFunction(MetadataTransactionContext ctx, FunctionSignature functionSignature) throws MetadataException;
+ void dropFunction(MetadataTransactionContext ctx, FunctionSignature functionSignature) throws AlgebricksException;
/**
* @param mdTxnCtx
@@ -408,9 +411,9 @@
* @param adapter
* An instance of type Adapter that represents the adapter being
* added
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void addAdapter(MetadataTransactionContext mdTxnCtx, DatasourceAdapter adapter) throws MetadataException;
+ void addAdapter(MetadataTransactionContext mdTxnCtx, DatasourceAdapter adapter) throws AlgebricksException;
/**
* @param ctx
@@ -420,10 +423,10 @@
* @param name
* name of the adapter
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
DatasourceAdapter getAdapter(MetadataTransactionContext ctx, String dataverseName, String name)
- throws MetadataException;
+ throws AlgebricksException;
/**
* @param ctx
@@ -432,9 +435,9 @@
* the dataverse associated with the adapter being dropped
* @param name
* name of the adapter
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void dropAdapter(MetadataTransactionContext ctx, String dataverseName, String name) throws MetadataException;
+ void dropAdapter(MetadataTransactionContext ctx, String dataverseName, String name) throws AlgebricksException;
/**
* @param ctx
@@ -442,90 +445,91 @@
* @param dataverseName
* the dataverse whose associated adapters are being requested
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
List<DatasourceAdapter> getDataverseAdapters(MetadataTransactionContext ctx, String dataverseName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* @param ctx
* @param policy
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void addCompactionPolicy(MetadataTransactionContext ctx, CompactionPolicy policy) throws MetadataException;
+ void addCompactionPolicy(MetadataTransactionContext ctx, CompactionPolicy policy) throws AlgebricksException;
/**
* @param ctx
* @param dataverse
* @param policyName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
CompactionPolicy getCompactionPolicy(MetadataTransactionContext ctx, String dataverse, String policyName)
- throws MetadataException;
+ throws AlgebricksException;
/**
* @param ctx
* @param dataverseName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- List<Function> getDataverseFunctions(MetadataTransactionContext ctx, String dataverseName) throws MetadataException;
+ List<Function> getDataverseFunctions(MetadataTransactionContext ctx, String dataverseName)
+ throws AlgebricksException;
/**
* @param ctx
* @param feed
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void addFeed(MetadataTransactionContext ctx, Feed feed) throws MetadataException;
+ void addFeed(MetadataTransactionContext ctx, Feed feed) throws AlgebricksException;
/**
* @param ctx
* @param dataverse
* @param feedName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- Feed getFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws MetadataException;
+ Feed getFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws AlgebricksException;
- List<Feed> getFeeds(MetadataTransactionContext ctx, String dataverse) throws MetadataException;
+ List<Feed> getFeeds(MetadataTransactionContext ctx, String dataverse) throws AlgebricksException;
/**
* @param ctx
* @param dataverse
* @param feedName
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void dropFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws MetadataException;
+ void dropFeed(MetadataTransactionContext ctx, String dataverse, String feedName) throws AlgebricksException;
/**
* @param ctx
* @param policy
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void addFeedPolicy(MetadataTransactionContext ctx, FeedPolicyEntity policy) throws MetadataException;
+ void addFeedPolicy(MetadataTransactionContext ctx, FeedPolicyEntity policy) throws AlgebricksException;
/**
* @param ctx
* @param dataverse
* @param policyName
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void dropFeedPolicy(MetadataTransactionContext ctx, String dataverse, String policyName) throws MetadataException;
+ void dropFeedPolicy(MetadataTransactionContext ctx, String dataverse, String policyName) throws AlgebricksException;
/**
* @param ctx
* @param dataverse
* @param policyName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
FeedPolicyEntity getFeedPolicy(MetadataTransactionContext ctx, String dataverse, String policyName)
- throws MetadataException;
+ throws AlgebricksException;
- void initializeDatasetIdFactory(MetadataTransactionContext ctx) throws MetadataException;
+ void initializeDatasetIdFactory(MetadataTransactionContext ctx) throws AlgebricksException;
- int getMostRecentDatasetId() throws MetadataException;
+ int getMostRecentDatasetId() throws AlgebricksException;
void acquireWriteLatch();
@@ -536,32 +540,32 @@
void releaseReadLatch();
/**
- * Removes a library , acquiring local locks on behalf of the given
- * transaction id.
+ * Removes a library , acquiring local locks on behalf of the given transaction
+ * id.
*
* @param ctx
* MetadataTransactionContext of an active metadata transaction.
* @param dataverseName
* dataverse asociated with the adapter that is to be deleted.
* @param libraryName
- * Name of library to be deleted. MetadataException for example,
- * if the library does not exists.
- * @throws MetadataException
+ * Name of library to be deleted. AlgebricksException for example, if
+ * the library does not exists.
+ * @throws AlgebricksException
*/
- void dropLibrary(MetadataTransactionContext ctx, String dataverseName, String libraryName) throws MetadataException;
+ void dropLibrary(MetadataTransactionContext ctx, String dataverseName, String libraryName)
+ throws AlgebricksException;
/**
- * Adds a library, acquiring local locks on behalf of the given
- * transaction id.
+ * Adds a library, acquiring local locks on behalf of the given transaction id.
*
* @param ctx
* MetadataTransactionContext of an active metadata transaction.
* @param library
* Library to be added
- * @throws MetadataException
+ * @throws AlgebricksException
* for example, if the library is already added.
*/
- void addLibrary(MetadataTransactionContext ctx, Library library) throws MetadataException;
+ void addLibrary(MetadataTransactionContext ctx, Library library) throws AlgebricksException;
/**
* @param ctx
@@ -571,11 +575,11 @@
* @param libraryName
* name of the library that is to be retrieved
* @return Library
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
Library getLibrary(MetadataTransactionContext ctx, String dataverseName, String libraryName)
- throws MetadataException, RemoteException;
+ throws AlgebricksException, RemoteException;
/**
* Retireve libraries installed in a given dataverse.
@@ -585,19 +589,20 @@
* @param dataverseName
* dataverse asociated with the library that is to be retrieved.
* @return Library
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- List<Library> getDataverseLibraries(MetadataTransactionContext ctx, String dataverseName) throws MetadataException;
+ List<Library> getDataverseLibraries(MetadataTransactionContext ctx, String dataverseName)
+ throws AlgebricksException;
/**
* @param mdTxnCtx
* MetadataTransactionContext of an active metadata transaction.
* @param externalFile
- * An instance of type ExternalFile that represents the external file being
- * added
- * @throws MetadataException
+ * An instance of type ExternalFile that represents the external file
+ * being added
+ * @throws AlgebricksException
*/
- void addExternalFile(MetadataTransactionContext mdTxnCtx, ExternalFile externalFile) throws MetadataException;
+ void addExternalFile(MetadataTransactionContext mdTxnCtx, ExternalFile externalFile) throws AlgebricksException;
/**
* @param mdTxnCtx
@@ -605,20 +610,20 @@
* @param dataset
* An instance of type Dataset that represents the "external" dataset
* @return A list of external files belonging to the dataset
- * @throws MetadataException
+ * @throws AlgebricksException
*/
List<ExternalFile> getDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset)
- throws MetadataException;
+ throws AlgebricksException;
/**
* @param mdTxnCtx
* MetadataTransactionContext of an active metadata transaction.
* @param externalFile
- * An instance of type ExternalFile that represents the external file being
- * dropped
- * @throws MetadataException
+ * An instance of type ExternalFile that represents the external file
+ * being dropped
+ * @throws AlgebricksException
*/
- void dropExternalFile(MetadataTransactionContext mdTxnCtx, ExternalFile externalFile) throws MetadataException;
+ void dropExternalFile(MetadataTransactionContext mdTxnCtx, ExternalFile externalFile) throws AlgebricksException;
/**
* @param mdTxnCtx
@@ -626,9 +631,9 @@
* @param dataset
* An instance of type dataset that owns the external files being
* dropped
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void dropDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset) throws MetadataException;
+ void dropDatasetExternalFiles(MetadataTransactionContext mdTxnCtx, Dataset dataset) throws AlgebricksException;
/**
* Get en external file
@@ -638,10 +643,10 @@
* @param datasetName
* @param fileNumber
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
ExternalFile getExternalFile(MetadataTransactionContext mdTxnCtx, String dataverseName, String datasetName,
- Integer fileNumber) throws MetadataException;
+ Integer fileNumber) throws AlgebricksException;
/**
* update an existing dataset in metadata.
@@ -650,76 +655,73 @@
* MetadataTransactionContext of an active metadata transaction.
* @param dataset
* Existing Dataset.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset already exists.
*/
- void updateDataset(MetadataTransactionContext ctx, Dataset dataset) throws MetadataException;
+ void updateDataset(MetadataTransactionContext ctx, Dataset dataset) throws AlgebricksException;
/**
- * Clean up temporary datasets that have not been active for a long time.
- *
- * @throws MetadataException
- */
- void cleanupTempDatasets() throws MetadataException;
-
- /**
- * Add an extension entity to its extension dataset under the ongoing metadata transaction
+ * Add an extension entity to its extension dataset under the ongoing metadata
+ * transaction
*
* @param mdTxnCtx
* @param entity
- * @throws MetadataException
+ * @throws AlgebricksException
*/
<T extends IExtensionMetadataEntity> void addEntity(MetadataTransactionContext mdTxnCtx, T entity)
- throws MetadataException;
+ throws AlgebricksException;
/**
- * Upsert an extension entity to its extension dataset under the ongoing metadata transaction
+ * Upsert an extension entity to its extension dataset under the ongoing
+ * metadata transaction
*
* @param mdTxnCtx
* @param entity
- * @throws MetadataException
+ * @throws AlgebricksException
*/
<T extends IExtensionMetadataEntity> void upsertEntity(MetadataTransactionContext mdTxnCtx, T entity)
- throws MetadataException;
+ throws AlgebricksException;
/**
- * Deletes an extension entity from its extension dataset under the ongoing metadata transaction
+ * Deletes an extension entity from its extension dataset under the ongoing
+ * metadata transaction
*
* @param mdTxnCtx
* @param entity
- * @throws MetadataException
+ * @throws AlgebricksException
*/
<T extends IExtensionMetadataEntity> void deleteEntity(MetadataTransactionContext mdTxnCtx, T entity)
- throws MetadataException;
+ throws AlgebricksException;
/**
- * Gets a list of extension entities matching a search key under the ongoing metadata transaction
+ * Gets a list of extension entities matching a search key under the ongoing
+ * metadata transaction
*
* @param mdTxnCtx
* @param searchKey
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
*/
<T extends IExtensionMetadataEntity> List<T> getEntities(MetadataTransactionContext mdTxnCtx,
- IExtensionMetadataSearchKey searchKey) throws MetadataException;
+ IExtensionMetadataSearchKey searchKey) throws AlgebricksException;
/**
- * Indicate when the metadata node has left or rejoined the cluster, and the MetadataManager should
- * rebind it
+ * Indicate when the metadata node has left or rejoined the cluster, and the
+ * MetadataManager should rebind it
*/
void rebindMetadataNode();
/**
* Feed Connection Related Metadata operations
*/
- void addFeedConnection(MetadataTransactionContext ctx, FeedConnection feedConnection) throws MetadataException;
+ void addFeedConnection(MetadataTransactionContext ctx, FeedConnection feedConnection) throws AlgebricksException;
void dropFeedConnection(MetadataTransactionContext ctx, String dataverseName, String feedName, String datasetName)
- throws MetadataException;
+ throws AlgebricksException;
FeedConnection getFeedConnection(MetadataTransactionContext ctx, String dataverseName, String feedName,
- String datasetName) throws MetadataException;
+ String datasetName) throws AlgebricksException;
List<FeedConnection> getFeedConections(MetadataTransactionContext ctx, String dataverseName, String feedName)
- throws MetadataException;
+ throws AlgebricksException;
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
index a990d29..cdb27d7 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IMetadataNode.java
@@ -25,9 +25,8 @@
import java.util.List;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.functions.FunctionSignature;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.ExternalFile;
import org.apache.asterix.metadata.entities.CompactionPolicy;
import org.apache.asterix.metadata.entities.Dataset;
@@ -42,15 +41,15 @@
import org.apache.asterix.metadata.entities.Library;
import org.apache.asterix.metadata.entities.Node;
import org.apache.asterix.metadata.entities.NodeGroup;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
/**
* A metadata node stores metadata in its local storage structures (currently
* BTrees). A metadata node services requests on behalf of the (possibly remote)
* metadata manager by executing local transactions against its local storage.
- * This interface mirrors the methods in IMetadataManager.
- * Users wanting to lock/access metadata shall always go through the
- * MetadataManager, and should never call methods on the MetadataNode directly
- * for any reason.
+ * This interface mirrors the methods in IMetadataManager. Users wanting to
+ * lock/access metadata shall always go through the MetadataManager, and should
+ * never call methods on the MetadataNode directly for any reason.
*/
public interface IMetadataNode extends Remote, Serializable {
@@ -60,7 +59,7 @@
* @throws ACIDException
* @throws RemoteException
*/
- void beginTransaction(JobId jobId) throws ACIDException, RemoteException;
+ void beginTransaction(TxnId txnId) throws ACIDException, RemoteException;
/**
* Commits a local transaction against the metadata.
@@ -68,7 +67,7 @@
* @throws ACIDException
* @throws RemoteException
*/
- void commitTransaction(JobId jobId) throws ACIDException, RemoteException;
+ void commitTransaction(TxnId txnId) throws ACIDException, RemoteException;
/**
* Aborts a local transaction against the metadata.
@@ -76,7 +75,7 @@
* @throws ACIDException
* @throws RemoteException
*/
- void abortTransaction(JobId jobId) throws ACIDException, RemoteException;
+ void abortTransaction(TxnId txnId) throws ACIDException, RemoteException;
/**
* Locally locks the entire metadata in given mode on behalf of given
@@ -85,7 +84,7 @@
* @throws ACIDException
* @throws RemoteException
*/
- void lock(JobId jobId, byte lockMode) throws ACIDException, RemoteException;
+ void lock(TxnId txnId, byte lockMode) throws ACIDException, RemoteException;
/**
* Releases all local locks of given transaction id.
@@ -93,163 +92,164 @@
* @throws ACIDException
* @throws RemoteException
*/
- void unlock(JobId jobId, byte lockMode) throws ACIDException, RemoteException;
+ void unlock(TxnId txnId, byte lockMode) throws ACIDException, RemoteException;
/**
- * Inserts a new dataverse into the metadata, acquiring local locks on
- * behalf of the given transaction id.
+ * Inserts a new dataverse into the metadata, acquiring local locks on behalf of
+ * the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverse
* Dataverse instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse already exists.
* @throws RemoteException
*/
- void addDataverse(JobId jobId, Dataverse dataverse) throws MetadataException, RemoteException;
+ void addDataverse(TxnId txnId, Dataverse dataverse) throws AlgebricksException, RemoteException;
/**
- * Retrieves all dataverses, acquiring local locks on behalf of
- * the given transaction id.
+ * Retrieves all dataverses, acquiring local locks on behalf of the given
+ * transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @return A list of dataverse instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist.
* @throws RemoteException
*/
- List<Dataverse> getDataverses(JobId jobId) throws MetadataException, RemoteException;
+ List<Dataverse> getDataverses(TxnId txnId) throws AlgebricksException, RemoteException;
/**
- * Retrieves a dataverse with given name, acquiring local locks on behalf of
- * the given transaction id.
+ * Retrieves a dataverse with given name, acquiring local locks on behalf of the
+ * given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of the dataverse to retrieve.
* @return A dataverse instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist.
* @throws RemoteException
*/
- Dataverse getDataverse(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ Dataverse getDataverse(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
* Retrieves all datasets belonging to the given dataverse, acquiring local
* locks on behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of the dataverse of which to find all datasets.
* @return A list of dataset instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist. RemoteException
*/
- List<Dataset> getDataverseDatasets(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ List<Dataset> getDataverseDatasets(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
* Deletes the dataverse with given name, and all it's associated datasets,
- * indexes, and types, acquiring local locks on behalf of the given
- * transaction id.
+ * indexes, and types, acquiring local locks on behalf of the given transaction
+ * id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @return A list of dataset instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataverse does not exist.
* @throws RemoteException
*/
- void dropDataverse(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ void dropDataverse(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
- * Inserts a new dataset into the metadata, acquiring local locks on behalf
- * of the given transaction id.
+ * Inserts a new dataset into the metadata, acquiring local locks on behalf of
+ * the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataset
* Dataset instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset already exists.
* @throws RemoteException
*/
- void addDataset(JobId jobId, Dataset dataset) throws MetadataException, RemoteException;
+ void addDataset(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException;
/**
- * Retrieves a dataset within a given dataverse, acquiring local locks on
- * behalf of the given transaction id.
+ * Retrieves a dataset within a given dataverse, acquiring local locks on behalf
+ * of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Dataverse name to look for the dataset.
* @param datasetName
* Name of dataset to be retrieved.
* @return A dataset instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset does not exist.
* @throws RemoteException
*/
- Dataset getDataset(JobId jobId, String dataverseName, String datasetName) throws MetadataException, RemoteException;
+ Dataset getDataset(TxnId txnId, String dataverseName, String datasetName)
+ throws AlgebricksException, RemoteException;
/**
- * Retrieves all indexes of a dataset, acquiring local locks on behalf of
- * the given transaction id.
+ * Retrieves all indexes of a dataset, acquiring local locks on behalf of the
+ * given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of dataverse which holds the given dataset.
* @param datasetName
* Name of dataset for which to retrieve all indexes.
* @return A list of Index instances.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset and/or dataverse does not exist.
* @throws RemoteException
*/
- List<Index> getDatasetIndexes(JobId jobId, String dataverseName, String datasetName)
- throws MetadataException, RemoteException;
+ List<Index> getDatasetIndexes(TxnId txnId, String dataverseName, String datasetName)
+ throws AlgebricksException, RemoteException;
/**
* Deletes the dataset with given name, and all it's associated indexes,
* acquiring local locks on behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of dataverse which holds the given dataset.
* @param datasetName
* Name of dataset to delete.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset and/or dataverse does not exist.
* @throws RemoteException
*/
- void dropDataset(JobId jobId, String dataverseName, String datasetName) throws MetadataException, RemoteException;
+ void dropDataset(TxnId txnId, String dataverseName, String datasetName) throws AlgebricksException, RemoteException;
/**
- * Inserts an index into the metadata, acquiring local locks on behalf of
- * the given transaction id. The index itself knows its name, and which
- * dataset it belongs to.
+ * Inserts an index into the metadata, acquiring local locks on behalf of the
+ * given transaction id. The index itself knows its name, and which dataset it
+ * belongs to.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param index
* Index instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index already exists.
* @throws RemoteException
*/
- void addIndex(JobId jobId, Index index) throws MetadataException, RemoteException;
+ void addIndex(TxnId txnId, Index index) throws AlgebricksException, RemoteException;
/**
* Retrieves the index with given name, in given dataverse and dataset,
* acquiring local locks on behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of the datavers holding the given dataset.
@@ -257,346 +257,352 @@
* Name of the dataset holding the index.
* @indexName Name of the index to retrieve.
* @return An Index instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index does not exist.
* @throws RemoteException
*/
- Index getIndex(JobId jobId, String dataverseName, String datasetName, String indexName)
- throws MetadataException, RemoteException;
+ Index getIndex(TxnId txnId, String dataverseName, String datasetName, String indexName)
+ throws AlgebricksException, RemoteException;
/**
- * Deletes the index with given name, in given dataverse and dataset,
- * acquiring local locks on behalf of the given transaction id.
+ * Deletes the index with given name, in given dataverse and dataset, acquiring
+ * local locks on behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of the datavers holding the given dataset.
* @param datasetName
* Name of the dataset holding the index.
* @indexName Name of the index to retrieve.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index does not exist.
* @throws RemoteException
*/
- void dropIndex(JobId jobId, String dataverseName, String datasetName, String indexName)
- throws MetadataException, RemoteException;
+ void dropIndex(TxnId txnId, String dataverseName, String datasetName, String indexName)
+ throws AlgebricksException, RemoteException;
/**
- * Inserts a datatype, acquiring local locks on behalf of the given
- * transaction id.
+ * Inserts a datatype, acquiring local locks on behalf of the given transaction
+ * id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param datatype
* Datatype instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the datatype already exists.
* @throws RemoteException
*/
- void addDatatype(JobId jobId, Datatype datatype) throws MetadataException, RemoteException;
+ void addDatatype(TxnId txnId, Datatype datatype) throws AlgebricksException, RemoteException;
/**
- * Retrieves the datatype with given name in given dataverse, acquiring
- * local locks on behalf of the given transaction id.
+ * Retrieves the datatype with given name in given dataverse, acquiring local
+ * locks on behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of dataverse holding the datatype.
* @param datatypeName
* Name of datatype to be retrieved.
* @return A datatype instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the datatype does not exist.
* @throws RemoteException
*/
- Datatype getDatatype(JobId jobId, String dataverseName, String datatypeName)
- throws MetadataException, RemoteException;
+ Datatype getDatatype(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException;
/**
* Deletes the given datatype in given dataverse, acquiring local locks on
* behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of dataverse holding the datatype.
* @param datatypeName
* Name of datatype to be deleted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if there are still datasets using the type to be
* deleted.
* @throws RemoteException
*/
- void dropDatatype(JobId jobId, String dataverseName, String datatypeName) throws MetadataException, RemoteException;
+ void dropDatatype(TxnId txnId, String dataverseName, String datatypeName)
+ throws AlgebricksException, RemoteException;
/**
* Inserts a node group, acquiring local locks on behalf of the given
* transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param nodeGroup
* Node group instance to insert.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the node group already exists.
* @throws RemoteException
*/
- void addNodeGroup(JobId jobId, NodeGroup nodeGroup) throws MetadataException, RemoteException;
+ void addNodeGroup(TxnId txnId, NodeGroup nodeGroup) throws AlgebricksException, RemoteException;
/**
* Retrieves a node group, acquiring local locks on behalf of the given
* transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param nodeGroupName
* Name of node group to be retrieved.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the node group does not exist.
* @throws RemoteException
*/
- NodeGroup getNodeGroup(JobId jobId, String nodeGroupName) throws MetadataException, RemoteException;
+ NodeGroup getNodeGroup(TxnId txnId, String nodeGroupName) throws AlgebricksException, RemoteException;
/**
* Deletes a node group, acquiring local locks on behalf of the given
* transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param nodeGroupName
* Name of node group to be deleted.
* @param failSilently
- * true means it's a no-op if the node group cannot be dropped; false means it will throw an exception.
+ * true means it's a no-op if the node group cannot be dropped; false
+ * means it will throw an exception.
* @return Whether the node group has been successfully dropped.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, there are still datasets partitioned on the node
* group to be deleted.
* @throws RemoteException
*/
- boolean dropNodegroup(JobId jobId, String nodeGroupName, boolean failSilently)
- throws MetadataException, RemoteException;
+ boolean dropNodegroup(TxnId txnId, String nodeGroupName, boolean failSilently)
+ throws AlgebricksException, RemoteException;
/**
- * Inserts a node (compute node), acquiring local locks on behalf of the
- * given transaction id.
+ * Inserts a node (compute node), acquiring local locks on behalf of the given
+ * transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param node
* Node instance to be inserted.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the node already exists.
* @throws RemoteException
*/
- void addNode(JobId jobId, Node node) throws MetadataException, RemoteException;
+ void addNode(TxnId txnId, Node node) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param functionSignature
* An instance of functionSignature representing the function
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- Function getFunction(JobId jobId, FunctionSignature functionSignature) throws MetadataException, RemoteException;
+ Function getFunction(TxnId txnId, FunctionSignature functionSignature) throws AlgebricksException, RemoteException;
- List<Function> getFunctions(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ List<Function> getFunctions(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
- * Deletes a function, acquiring local locks on behalf of the given
- * transaction id.
+ * Deletes a function, acquiring local locks on behalf of the given transaction
+ * id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param functionSignature
* An instance of functionSignature representing the function
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, there are still datasets partitioned on the node
* group to be deleted.
* @throws RemoteException
*/
- void dropFunction(JobId jobId, FunctionSignature functionSignature) throws MetadataException, RemoteException;
+ void dropFunction(TxnId txnId, FunctionSignature functionSignature) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param function
* Function to be inserted
- * @throws MetadataException
+ * @throws AlgebricksException
* for example, if the function already exists or refers to an
* unknown function
* @throws RemoteException
*/
- void addFunction(JobId jobId, Function function) throws MetadataException, RemoteException;
+ void addFunction(TxnId txnId, Function function) throws AlgebricksException, RemoteException;
/**
- * @param ctx
+ * @param txnId
* @param dataverseName
- * @return List<Function> A list containing the functions in the specified dataverse
- * @throws MetadataException
+ * @return List<Function> A list containing the functions in the specified
+ * dataverse
+ * @throws AlgebricksException
* @throws RemoteException
*/
- List<Function> getDataverseFunctions(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ List<Function> getDataverseFunctions(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
- * @param ctx
+ * @param txnId
* @param dataverseName
- * @return List<Adapter> A list containing the adapters in the specified dataverse
- * @throws MetadataException
+ * @return List<Adapter> A list containing the adapters in the specified
+ * dataverse
+ * @throws AlgebricksException
* @throws RemoteException
*/
- List<DatasourceAdapter> getDataverseAdapters(JobId jobId, String dataverseName)
- throws MetadataException, RemoteException;
+ List<DatasourceAdapter> getDataverseAdapters(TxnId txnId, String dataverseName)
+ throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverseName
* @param adapterName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- DatasourceAdapter getAdapter(JobId jobId, String dataverseName, String adapterName)
- throws MetadataException, RemoteException;
+ DatasourceAdapter getAdapter(TxnId txnId, String dataverseName, String adapterName)
+ throws AlgebricksException, RemoteException;
/**
- * Deletes a adapter , acquiring local locks on behalf of the given
- * transaction id.
+ * Deletes a adapter , acquiring local locks on behalf of the given transaction
+ * id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* dataverse asociated with the adapter that is to be deleted.
* @param adapterName
- * Name of adapter to be deleted. MetadataException for example,
- * if the adapter does not exists.
+ * Name of adapter to be deleted. AlgebricksException for example, if
+ * the adapter does not exists.
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void dropAdapter(JobId jobId, String dataverseName, String adapterName) throws MetadataException, RemoteException;
+ void dropAdapter(TxnId txnId, String dataverseName, String adapterName) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param adapter
* Adapter to be inserted
- * @throws MetadataException
+ * @throws AlgebricksException
* for example, if the adapter already exists.
* @throws RemoteException
*/
- void addAdapter(JobId jobId, DatasourceAdapter adapter) throws MetadataException, RemoteException;
+ void addAdapter(TxnId txnId, DatasourceAdapter adapter) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param compactionPolicy
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void addCompactionPolicy(JobId jobId, CompactionPolicy compactionPolicy) throws MetadataException, RemoteException;
+ void addCompactionPolicy(TxnId txnId, CompactionPolicy compactionPolicy)
+ throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverse
* @param policy
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- CompactionPolicy getCompactionPolicy(JobId jobId, String dataverse, String policy)
- throws MetadataException, RemoteException;
+ CompactionPolicy getCompactionPolicy(TxnId txnId, String dataverse, String policy)
+ throws AlgebricksException, RemoteException;
/**
- * @param jobId
- * @throws MetadataException
+ * @param txnId
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void initializeDatasetIdFactory(JobId jobId) throws MetadataException, RemoteException;
+ void initializeDatasetIdFactory(TxnId txnId) throws AlgebricksException, RemoteException;
/**
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- int getMostRecentDatasetId() throws MetadataException, RemoteException;
+ int getMostRecentDatasetId() throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param feed
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void addFeed(JobId jobId, Feed feed) throws MetadataException, RemoteException;
+ void addFeed(TxnId txnId, Feed feed) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverse
* @param feedName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- Feed getFeed(JobId jobId, String dataverse, String feedName) throws MetadataException, RemoteException;
+ Feed getFeed(TxnId txnId, String dataverse, String feedName) throws AlgebricksException, RemoteException;
- List<Feed> getFeeds(JobId jobId, String dataverse) throws MetadataException, RemoteException;
+ List<Feed> getFeeds(TxnId txnId, String dataverse) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverse
* @param feedName
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void dropFeed(JobId jobId, String dataverse, String feedName) throws MetadataException, RemoteException;
+ void dropFeed(TxnId txnId, String dataverse, String feedName) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param feedPolicy
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void addFeedPolicy(JobId jobId, FeedPolicyEntity feedPolicy) throws MetadataException, RemoteException;
+ void addFeedPolicy(TxnId txnId, FeedPolicyEntity feedPolicy) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverse
* @param policy
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- FeedPolicyEntity getFeedPolicy(JobId jobId, String dataverse, String policy)
- throws MetadataException, RemoteException;
+ FeedPolicyEntity getFeedPolicy(TxnId txnId, String dataverse, String policy)
+ throws AlgebricksException, RemoteException;
/**
- * Removes a library , acquiring local locks on behalf of the given
- * transaction id.
+ * Removes a library , acquiring local locks on behalf of the given transaction
+ * id.
*
* @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* dataverse asociated with the adapter that is to be deleted.
* @param libraryName
- * Name of library to be deleted. MetadataException for example,
- * if the library does not exists.
+ * Name of library to be deleted. AlgebricksException for example, if
+ * the library does not exists.
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void dropLibrary(JobId jobId, String dataverseName, String libraryName) throws MetadataException, RemoteException;
+ void dropLibrary(TxnId txnId, String dataverseName, String libraryName) throws AlgebricksException, RemoteException;
/**
- * Adds a library, acquiring local locks on behalf of the given
- * transaction id.
+ * Adds a library, acquiring local locks on behalf of the given transaction id.
*
* @param txnId
* A globally unique id for an active metadata transaction.
* @param library
* Library to be added
- * @throws MetadataException
+ * @throws AlgebricksException
* for example, if the library is already added.
* @throws RemoteException
*/
- void addLibrary(JobId jobId, Library library) throws MetadataException, RemoteException;
+ void addLibrary(TxnId txnId, Library library) throws AlgebricksException, RemoteException;
/**
* @param txnId
@@ -606,10 +612,11 @@
* @param libraryName
* name of the library that is to be retrieved
* @return Library
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- Library getLibrary(JobId jobId, String dataverseName, String libraryName) throws MetadataException, RemoteException;
+ Library getLibrary(TxnId txnId, String dataverseName, String libraryName)
+ throws AlgebricksException, RemoteException;
/**
* Retireve libraries installed in a given dataverse.
@@ -619,97 +626,101 @@
* @param dataverseName
* dataverse asociated with the library that is to be retrieved.
* @return Library
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- List<Library> getDataverseLibraries(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ List<Library> getDataverseLibraries(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverseName
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- List<Feed> getDataverseFeeds(JobId jobId, String dataverseName) throws MetadataException, RemoteException;
+ List<Feed> getDataverseFeeds(TxnId txnId, String dataverseName) throws AlgebricksException, RemoteException;
/**
* delete a give feed (ingestion) policy
*
- * @param jobId
+ * @param txnId
* @param dataverseName
* @param policyName
* @return
* @throws RemoteException
- * @throws MetadataException
+ * @throws AlgebricksException
*/
- void dropFeedPolicy(JobId jobId, String dataverseName, String policyName) throws MetadataException, RemoteException;
+ void dropFeedPolicy(TxnId txnId, String dataverseName, String policyName)
+ throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* @param dataverse
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- List<FeedPolicyEntity> getDataversePolicies(JobId jobId, String dataverse)
- throws MetadataException, RemoteException;
+ List<FeedPolicyEntity> getDataversePolicies(TxnId txnId, String dataverse)
+ throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param externalFile
* An object representing the external file entity
- * @throws MetadataException
+ * @throws AlgebricksException
* for example, if the file already exists.
* @throws RemoteException
*/
- void addExternalFile(JobId jobId, ExternalFile externalFile) throws MetadataException, RemoteException;
+ void addExternalFile(TxnId txnId, ExternalFile externalFile) throws AlgebricksException, RemoteException;
/**
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataset
* A dataset the files belongs to.
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- List<ExternalFile> getExternalFiles(JobId jobId, Dataset dataset) throws MetadataException, RemoteException;
+ List<ExternalFile> getExternalFiles(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException;
/**
* Deletes an externalFile , acquiring local locks on behalf of the given
* transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
- * dataverse asociated with the external dataset that owns the file to be deleted.
+ * dataverse asociated with the external dataset that owns the file
+ * to be deleted.
* @param datasetName
* Name of dataset owning the file to be deleted.
* @param fileNumber
* the id number for the file to be deleted
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void dropExternalFile(JobId jobId, String dataverseName, String datasetName, int fileNumber)
- throws MetadataException, RemoteException;
+ void dropExternalFile(TxnId txnId, String dataverseName, String datasetName, int fileNumber)
+ throws AlgebricksException, RemoteException;
/**
- * Deletes all external files belonging to a dataset, acquiring local locks on behalf of the given
- * transaction id.
+ * Deletes all external files belonging to a dataset, acquiring local locks on
+ * behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataset
* An external dataset the files belong to.
+ * @throws AlgebricksException
* @throws RemoteException
*/
- void dropExternalFiles(JobId jobId, Dataset dataset) throws MetadataException, RemoteException;
+ void dropExternalFiles(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException;
/**
* Retrieves the file with given number, in given dataverse and dataset,
* acquiring local locks on behalf of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataverseName
* Name of the datavers holding the given dataset.
@@ -718,81 +729,82 @@
* @param fileNumber
* Number of the file
* @return An ExternalFile instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the index does not exist.
* @throws RemoteException
*/
- ExternalFile getExternalFile(JobId jobId, String dataverseName, String datasetName, Integer fileNumber)
- throws MetadataException, RemoteException;
+ ExternalFile getExternalFile(TxnId txnId, String dataverseName, String datasetName, Integer fileNumber)
+ throws AlgebricksException, RemoteException;
/**
* update an existing dataset in the metadata, acquiring local locks on behalf
* of the given transaction id.
*
- * @param jobId
+ * @param txnId
* A globally unique id for an active metadata transaction.
* @param dataset
* updated Dataset instance.
- * @throws MetadataException
+ * @throws AlgebricksException
* For example, if the dataset already exists.
* @throws RemoteException
*/
- void updateDataset(JobId jobId, Dataset dataset) throws MetadataException, RemoteException;
+ void updateDataset(TxnId txnId, Dataset dataset) throws AlgebricksException, RemoteException;
/**
* Adds an extension entity under the ongoing transaction job id
*
- * @param jobId
+ * @param txnId
* @param entity
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- <T extends IExtensionMetadataEntity> void addEntity(JobId jobId, T entity)
- throws MetadataException, RemoteException;
+ <T extends IExtensionMetadataEntity> void addEntity(TxnId txnId, T entity)
+ throws AlgebricksException, RemoteException;
/**
* Upserts an extension entity under the ongoing transaction job id
*
- * @param jobId
+ * @param txnId
* @param entity
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- <T extends IExtensionMetadataEntity> void upsertEntity(JobId jobId, T entity)
- throws MetadataException, RemoteException;
+ <T extends IExtensionMetadataEntity> void upsertEntity(TxnId txnId, T entity)
+ throws AlgebricksException, RemoteException;
/**
* Deletes an extension entity under the ongoing transaction job id
*
- * @param jobId
+ * @param txnId
* @param entity
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- <T extends IExtensionMetadataEntity> void deleteEntity(JobId jobId, T entity)
- throws MetadataException, RemoteException;
+ <T extends IExtensionMetadataEntity> void deleteEntity(TxnId txnId, T entity)
+ throws AlgebricksException, RemoteException;
/**
- * Gets a list of extension entities matching a search key under the ongoing transaction
+ * Gets a list of extension entities matching a search key under the ongoing
+ * transaction
*
- * @param jobId
+ * @param txnId
* @param searchKey
* @return
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws RemoteException
*/
- <T extends IExtensionMetadataEntity> List<T> getEntities(JobId jobId, IExtensionMetadataSearchKey searchKey)
- throws MetadataException, RemoteException;
+ <T extends IExtensionMetadataEntity> List<T> getEntities(TxnId txnId, IExtensionMetadataSearchKey searchKey)
+ throws AlgebricksException, RemoteException;
- void addFeedConnection(JobId jobId, FeedConnection feedConnection) throws MetadataException, RemoteException;
+ void addFeedConnection(TxnId txnId, FeedConnection feedConnection) throws AlgebricksException, RemoteException;
- FeedConnection getFeedConnection(JobId jobId, String dataverseName, String feedName, String datasetName)
- throws MetadataException, RemoteException;
+ FeedConnection getFeedConnection(TxnId txnId, String dataverseName, String feedName, String datasetName)
+ throws AlgebricksException, RemoteException;
- void dropFeedConnection(JobId jobId, String dataverseName, String feedName, String datasetName)
- throws MetadataException, RemoteException;
+ void dropFeedConnection(TxnId txnId, String dataverseName, String feedName, String datasetName)
+ throws AlgebricksException, RemoteException;
- List<FeedConnection> getFeedConnections(JobId jobId, String dataverseName, String feedName)
- throws MetadataException, RemoteException;
+ List<FeedConnection> getFeedConnections(TxnId txnId, String dataverseName, String feedName)
+ throws AlgebricksException, RemoteException;
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
index c2b61ee..4cc7719 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/api/IValueExtractor.java
@@ -22,8 +22,8 @@
import java.io.IOException;
import java.rmi.RemoteException;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -38,15 +38,14 @@
/**
* Extracts an object of type T from a given tuple.
*
- * @param jobId
+ * @param txnId
* A globally unique transaction id.
* @param tuple
* Tuple from which an object shall be extracted.
* @return New object of type T.
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws HyracksDataException
* @throws IOException
*/
- public T getValue(JobId jobId, ITupleReference tuple)
- throws MetadataException, HyracksDataException, RemoteException;
+ T getValue(TxnId txnId, ITupleReference tuple) throws AlgebricksException, HyracksDataException, RemoteException;
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
index a6f1ad0..4c98904 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
@@ -33,6 +33,7 @@
import org.apache.asterix.common.config.GlobalConfig;
import org.apache.asterix.common.config.MetadataProperties;
import org.apache.asterix.common.context.AsterixVirtualBufferCacheProvider;
+import org.apache.asterix.common.context.DatasetLSMComponentIdGeneratorFactory;
import org.apache.asterix.common.context.CorrelatedPrefixMergePolicyFactory;
import org.apache.asterix.common.context.IStorageComponentProvider;
import org.apache.asterix.common.exceptions.ACIDException;
@@ -69,6 +70,7 @@
import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerFactory;
import org.apache.asterix.transaction.management.resource.DatasetLocalResourceFactory;
import org.apache.asterix.transaction.management.service.transaction.TransactionManagementConstants.LockManagerConstants.LockMode;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
@@ -79,6 +81,7 @@
import org.apache.hyracks.storage.am.common.build.IndexBuilder;
import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelper;
import org.apache.hyracks.storage.am.lsm.btree.dataflow.LSMBTreeLocalResourceFactory;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTrackerFactory;
@@ -125,11 +128,11 @@
* @param isNewUniverse
* @throws ACIDException
* @throws RemoteException
- * @throws MetadataException
+ * @throws AlgebricksException
* @throws Exception
*/
public static void startUniverse(INCServiceContext ncServiceContext, boolean isNewUniverse)
- throws RemoteException, ACIDException, MetadataException {
+ throws RemoteException, ACIDException, AlgebricksException {
MetadataBootstrap.setNewUniverse(isNewUniverse);
appContext = (INcApplicationContext) ncServiceContext.getApplicationContext();
@@ -183,7 +186,7 @@
}
}
- private static void insertInitialDataverses(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ private static void insertInitialDataverses(MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
String dataFormat = NonTaggedDataFormat.NON_TAGGED_DATA_FORMAT;
MetadataManager.INSTANCE.addDataverse(mdTxnCtx,
new Dataverse(MetadataConstants.METADATA_DATAVERSE_NAME, dataFormat, MetadataUtil.PENDING_NO_OP));
@@ -191,19 +194,19 @@
}
/**
- * Inserts a metadata dataset to the physical dataset index
- * Should be performed on a bootstrap of a new universe
+ * Inserts a metadata dataset to the physical dataset index Should be performed
+ * on a bootstrap of a new universe
*
* @param mdTxnCtx
* @param indexes
- * @throws MetadataException
+ * @throws AlgebricksException
*/
public static void insertMetadataDatasets(MetadataTransactionContext mdTxnCtx, IMetadataIndex[] indexes)
- throws MetadataException {
+ throws AlgebricksException {
for (int i = 0; i < indexes.length; i++) {
IDatasetDetails id = new InternalDatasetDetails(FileStructure.BTREE, PartitioningStrategy.HASH,
indexes[i].getPartitioningExpr(), indexes[i].getPartitioningExpr(), null,
- indexes[i].getPartitioningExprType(), false, null, false);
+ indexes[i].getPartitioningExprType(), false, null);
MetadataManager.INSTANCE.addDataset(mdTxnCtx,
new Dataset(indexes[i].getDataverseName(), indexes[i].getIndexedDatasetName(),
indexes[i].getDataverseName(), indexes[i].getPayloadRecordType().getTypeName(),
@@ -222,7 +225,7 @@
}
}
- private static void insertMetadataDatatypes(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ private static void insertMetadataDatatypes(MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
ArrayList<IAType> types = new ArrayList<>();
types.addAll(BuiltinTypeMap.getAllBuiltinTypes());
getMetadataTypes(types);
@@ -236,20 +239,20 @@
}
}
- private static void insertNodes(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ private static void insertNodes(MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
for (String nodesName : nodeNames) {
MetadataManager.INSTANCE.addNode(mdTxnCtx, new Node(nodesName, 0, 0));
}
}
- private static void insertInitialGroups(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ private static void insertInitialGroups(MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
List<String> metadataGroupNodeNames = new ArrayList<>();
metadataGroupNodeNames.add(metadataNodeName);
NodeGroup groupRecord = new NodeGroup(MetadataConstants.METADATA_NODEGROUP_NAME, metadataGroupNodeNames);
MetadataManager.INSTANCE.addNodegroup(mdTxnCtx, groupRecord);
}
- private static void insertInitialAdapters(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ private static void insertInitialAdapters(MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
String[] builtInAdapterClassNames = new String[] { GenericAdapterFactory.class.getName() };
DatasourceAdapter adapter;
for (String adapterClassName : builtInAdapterClassNames) {
@@ -261,7 +264,8 @@
}
}
- private static void insertInitialCompactionPolicies(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ private static void insertInitialCompactionPolicies(MetadataTransactionContext mdTxnCtx)
+ throws AlgebricksException {
String[] builtInCompactionPolicyClassNames =
new String[] { ConstantMergePolicyFactory.class.getName(), PrefixMergePolicyFactory.class.getName(),
NoMergePolicyFactory.class.getName(), CorrelatedPrefixMergePolicyFactory.class.getName() };
@@ -271,7 +275,7 @@
}
}
- private static DatasourceAdapter getAdapter(String adapterFactoryClassName) throws MetadataException {
+ private static DatasourceAdapter getAdapter(String adapterFactoryClassName) throws AlgebricksException {
try {
String adapterName = ((IAdapterFactory) (Class.forName(adapterFactoryClassName).newInstance())).getAlias();
return new DatasourceAdapter(new AdapterIdentifier(MetadataConstants.METADATA_DATAVERSE_NAME, adapterName),
@@ -282,7 +286,7 @@
}
private static CompactionPolicy getCompactionPolicyEntity(String compactionPolicyClassName)
- throws MetadataException {
+ throws AlgebricksException {
try {
String policyName =
((ILSMMergePolicyFactory) (Class.forName(compactionPolicyClassName).newInstance())).getName();
@@ -294,8 +298,8 @@
}
/**
- * Enlist a metadata index so it is available for metadata operations
- * should be performed upon bootstrapping
+ * Enlist a metadata index so it is available for metadata operations should be
+ * performed upon bootstrapping
*
* @param index
* @throws HyracksDataException
@@ -318,13 +322,18 @@
IBinaryComparatorFactory[] cmpFactories = index.getKeyBinaryComparatorFactory();
int[] bloomFilterKeyFields = index.getBloomFilterKeyFields();
- // opTrackerProvider and ioOpCallbackFactory should both be acquired through IStorageManager
- // We are unable to do this since IStorageManager needs a dataset to determine the appropriate
+ // opTrackerProvider and ioOpCallbackFactory should both be acquired through
+ // IStorageManager
+ // We are unable to do this since IStorageManager needs a dataset to determine
+ // the appropriate
// objects
ILSMOperationTrackerFactory opTrackerFactory =
index.isPrimaryIndex() ? new PrimaryIndexOperationTrackerFactory(datasetId)
: new SecondaryIndexOperationTrackerFactory(datasetId);
- ILSMIOOperationCallbackFactory ioOpCallbackFactory = LSMBTreeIOOperationCallbackFactory.INSTANCE;
+ ILSMComponentIdGeneratorFactory idGeneratorProvider =
+ new DatasetLSMComponentIdGeneratorFactory(index.getDatasetId().getId());
+ ILSMIOOperationCallbackFactory ioOpCallbackFactory =
+ new LSMBTreeIOOperationCallbackFactory(idGeneratorProvider);
IStorageComponentProvider storageComponentProvider = appContext.getStorageComponentProvider();
if (isNewUniverse()) {
LSMBTreeLocalResourceFactory lsmBtreeFactory = new LSMBTreeLocalResourceFactory(
@@ -336,7 +345,8 @@
bloomFilterKeyFields, appContext.getBloomFilterFalsePositiveRate(), true, null);
DatasetLocalResourceFactory dsLocalResourceFactory =
new DatasetLocalResourceFactory(datasetId, lsmBtreeFactory);
- // TODO(amoudi) Creating the index should be done through the same code path as other indexes
+ // TODO(amoudi) Creating the index should be done through the same code path as
+ // other indexes
// This is to be done by having a metadata dataset associated with each index
IIndexBuilder indexBuilder = new IndexBuilder(ncServiceCtx, storageComponentProvider.getStorageManager(),
index::getResourceId, file, dsLocalResourceFactory, true);
@@ -349,7 +359,8 @@
.get(appContext.getTransactionSubsystem().getId())
+ " to intialize as a new instance. (WARNING: all data will be lost.)");
}
- // Why do we care about metadata dataset's resource ids? why not assign them ids similar to other resources?
+ // Why do we care about metadata dataset's resource ids? why not assign them ids
+ // similar to other resources?
if (index.getResourceId() != resource.getId()) {
throw new HyracksDataException("Resource Id doesn't match expected metadata index resource id");
}
@@ -363,9 +374,10 @@
/**
* Perform recovery of DDL operations metadata records
*/
- public static void startDDLRecovery() throws MetadataException {
+ public static void startDDLRecovery() throws AlgebricksException {
// #. clean up any record which has pendingAdd/DelOp flag
- // as traversing all records from DATAVERSE_DATASET to DATASET_DATASET, and then to INDEX_DATASET.
+ // as traversing all records from DATAVERSE_DATASET to DATASET_DATASET, and then
+ // to INDEX_DATASET.
MetadataTransactionContext mdTxnCtx = null;
MetadataManager.INSTANCE.acquireWriteLatch();
if (LOGGER.isLoggable(Level.INFO)) {
@@ -378,7 +390,8 @@
for (Dataverse dataverse : dataverses) {
recoverDataverse(mdTxnCtx, dataverse);
}
- // the commit wasn't there before. yet, everything was working correctly!!!!!!!!!!!
+ // the commit wasn't there before. yet, everything was working
+ // correctly!!!!!!!!!!!
MetadataManager.INSTANCE.commitTransaction(mdTxnCtx);
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Completed DDL recovery.");
@@ -399,7 +412,7 @@
}
private static void recoverDataverse(MetadataTransactionContext mdTxnCtx, Dataverse dataverse)
- throws MetadataException {
+ throws AlgebricksException {
if (dataverse.getPendingOp() != MetadataUtil.PENDING_NO_OP) {
// drop pending dataverse
MetadataManager.INSTANCE.dropDataverse(mdTxnCtx, dataverse.getDataverseName());
@@ -415,7 +428,8 @@
}
}
- private static void recoverDataset(MetadataTransactionContext mdTxnCtx, Dataset dataset) throws MetadataException {
+ private static void recoverDataset(MetadataTransactionContext mdTxnCtx, Dataset dataset)
+ throws AlgebricksException {
if (dataset.getPendingOp() != MetadataUtil.PENDING_NO_OP) {
// drop pending dataset
MetadataManager.INSTANCE.dropDataset(mdTxnCtx, dataset.getDataverseName(), dataset.getDatasetName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManager.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManager.java
index 1b4f5dc..c1c19a4 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManager.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManager.java
@@ -91,42 +91,36 @@
}
@Override
- public void addNode(ICcApplicationContext appCtx, Node node) throws AsterixException {
- try {
- Cluster cluster = ClusterProperties.INSTANCE.getCluster();
- List<Pattern> pattern = new ArrayList<>();
- String asterixInstanceName = appCtx.getMetadataProperties().getInstanceName();
- Patterns prepareNode = PatternCreator.INSTANCE.createPrepareNodePattern(asterixInstanceName,
- ClusterProperties.INSTANCE.getCluster(), node);
- cluster.getNode().add(node);
- client.submit(prepareNode);
+ public void addNode(ICcApplicationContext appCtx, Node node) throws Exception {
+ Cluster cluster = ClusterProperties.INSTANCE.getCluster();
+ List<Pattern> pattern = new ArrayList<>();
+ String asterixInstanceName = appCtx.getMetadataProperties().getInstanceName();
+ Patterns prepareNode = PatternCreator.INSTANCE.createPrepareNodePattern(asterixInstanceName,
+ ClusterProperties.INSTANCE.getCluster(), node);
+ cluster.getNode().add(node);
+ client.submit(prepareNode);
- ExternalProperties externalProps = appCtx.getExternalProperties();
- AsterixEventServiceUtil.poulateClusterEnvironmentProperties(cluster, externalProps.getCCJavaParams(),
- externalProps.getNCJavaParams());
+ ExternalProperties externalProps = appCtx.getExternalProperties();
+ AsterixEventServiceUtil.poulateClusterEnvironmentProperties(cluster, externalProps.getCCJavaParams(),
+ externalProps.getNCJavaParams());
- pattern.clear();
- String ccHost = cluster.getMasterNode().getClusterIp();
- String hostId = node.getId();
- String nodeControllerId = asterixInstanceName + "_" + node.getId();
- String iodevices = node.getIodevices() == null ? cluster.getIodevices() : node.getIodevices();
- Pattern startNC =
- PatternCreator.INSTANCE.createNCStartPattern(ccHost, hostId, nodeControllerId, iodevices, false);
- pattern.add(startNC);
- Patterns startNCPattern = new Patterns(pattern);
- client.submit(startNCPattern);
+ pattern.clear();
+ String ccHost = cluster.getMasterNode().getClusterIp();
+ String hostId = node.getId();
+ String nodeControllerId = asterixInstanceName + "_" + node.getId();
+ String iodevices = node.getIodevices() == null ? cluster.getIodevices() : node.getIodevices();
+ Pattern startNC =
+ PatternCreator.INSTANCE.createNCStartPattern(ccHost, hostId, nodeControllerId, iodevices, false);
+ pattern.add(startNC);
+ Patterns startNCPattern = new Patterns(pattern);
+ client.submit(startNCPattern);
- removeNode(cluster.getSubstituteNodes().getNode(), node);
+ removeNode(cluster.getSubstituteNodes().getNode(), node);
- AsterixInstance instance = lookupService.getAsterixInstance(cluster.getInstanceName());
- instance.getCluster().getNode().add(node);
- removeNode(instance.getCluster().getSubstituteNodes().getNode(), node);
- lookupService.updateAsterixInstance(instance);
-
- } catch (Exception e) {
- throw new AsterixException(e);
- }
-
+ AsterixInstance instance = lookupService.getAsterixInstance(cluster.getInstanceName());
+ instance.getCluster().getNode().add(node);
+ removeNode(instance.getCluster().getSubstituteNodes().getNode(), node);
+ lookupService.updateAsterixInstance(instance);
}
private void removeNode(List<Node> list, Node node) {
@@ -146,7 +140,7 @@
}
@Override
- public void removeNode(Node node) throws AsterixException {
+ public void removeNode(Node node) {
// to be implemented later.
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagerProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagerProvider.java
index d11e70d..2b7c9df 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagerProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/cluster/ClusterManagerProvider.java
@@ -58,12 +58,12 @@
}
private static class NoopClusterManager implements IClusterManager {
@Override
- public void addNode(ICcApplicationContext appCtx, Node node) throws AsterixException {
+ public void addNode(ICcApplicationContext appCtx, Node node) {
// no-op
}
@Override
- public void removeNode(Node node) throws AsterixException {
+ public void removeNode(Node node) {
// no-op
}
@@ -83,7 +83,7 @@
}
@Override
- public void notifyStartupCompleted() throws Exception {
+ public void notifyStartupCompleted() {
// no-op
}
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/BTreeResourceFactoryProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/BTreeResourceFactoryProvider.java
index bfc6a8e..301aafb 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/BTreeResourceFactoryProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/BTreeResourceFactoryProvider.java
@@ -69,7 +69,6 @@
ITypeTraits[] typeTraits = getTypeTraits(mdProvider, dataset, index, recordType, metaType);
IBinaryComparatorFactory[] cmpFactories = getCmpFactories(mdProvider, dataset, index, recordType, metaType);
int[] bloomFilterFields = getBloomFilterFields(dataset, index);
- boolean durable = !dataset.isTemp();
double bloomFilterFalsePositiveRate = mdProvider.getStorageProperties().getBloomFilterFalsePositiveRate();
ILSMOperationTrackerFactory opTrackerFactory = dataset.getIndexOperationTrackerFactory(index);
ILSMIOOperationCallbackFactory ioOpCallbackFactory = dataset.getIoOperationCallbackFactory(index);
@@ -84,12 +83,12 @@
? new ExternalBTreeLocalResourceFactory(storageManager, typeTraits, cmpFactories,
filterTypeTraits, filterCmpFactories, filterFields, opTrackerFactory,
ioOpCallbackFactory, metadataPageManagerFactory, ioSchedulerProvider,
- mergePolicyFactory, mergePolicyProperties, durable, bloomFilterFields,
+ mergePolicyFactory, mergePolicyProperties, true, bloomFilterFields,
bloomFilterFalsePositiveRate, false, btreeFields)
: new ExternalBTreeWithBuddyLocalResourceFactory(storageManager, typeTraits, cmpFactories,
filterTypeTraits, filterCmpFactories, filterFields, opTrackerFactory,
ioOpCallbackFactory, metadataPageManagerFactory, ioSchedulerProvider,
- mergePolicyFactory, mergePolicyProperties, durable, bloomFilterFields,
+ mergePolicyFactory, mergePolicyProperties, true, bloomFilterFields,
bloomFilterFalsePositiveRate, false, btreeFields);
case INTERNAL:
AsterixVirtualBufferCacheProvider vbcProvider =
@@ -97,7 +96,7 @@
return new LSMBTreeLocalResourceFactory(storageManager, typeTraits, cmpFactories, filterTypeTraits,
filterCmpFactories, filterFields, opTrackerFactory, ioOpCallbackFactory,
metadataPageManagerFactory, vbcProvider, ioSchedulerProvider, mergePolicyFactory,
- mergePolicyProperties, durable, bloomFilterFields, bloomFilterFalsePositiveRate,
+ mergePolicyProperties, true, bloomFilterFields, bloomFilterFalsePositiveRate,
index.isPrimaryIndex(), btreeFields);
default:
throw new CompilationException(ErrorCode.COMPILATION_UNKNOWN_DATASET_TYPE,
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
index b13f4c2..91030bf 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/LoadableDataSource.java
@@ -65,17 +65,13 @@
if (isPKAutoGenerated) {
// Since the key is auto-generated, we need to use another
// record type (possibly nested) which has all fields except the PK
- try {
- recType = getStrippedPKType(new LinkedList<>(partitioningKeys.get(0)), recType);
- } catch (AsterixException e) {
- throw new AlgebricksException(e);
- }
+ recType = getStrippedPKType(new LinkedList<>(partitioningKeys.get(0)), recType);
}
schemaTypes = new IAType[] { recType };
}
private ARecordType getStrippedPKType(List<String> partitioningKeys, ARecordType recType)
- throws AsterixException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
List<String> fieldNames = new LinkedList<>();
List<IAType> fieldTypes = new LinkedList<>();
int j = 0;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
index 97c6ed2..abadfb2 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataManagerUtil.java
@@ -23,7 +23,6 @@
import org.apache.asterix.common.cluster.IClusterStateManager;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.metadata.MetadataTransactionContext;
import org.apache.asterix.metadata.entities.Dataset;
@@ -52,13 +51,7 @@
if (dataverse == null || typeName == null) {
return null;
}
- Datatype type;
- try {
- type = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, dataverse, typeName);
- } catch (MetadataException e) {
- throw new AlgebricksException(
- "Metadata exception while looking up type '" + typeName + "' in dataverse '" + dataverse + "'", e);
- }
+ Datatype type = MetadataManager.INSTANCE.getDatatype(mdTxnCtx, dataverse, typeName);
if (type == null) {
throw new AlgebricksException("Type name '" + typeName + "' unknown in dataverse '" + dataverse + "'");
}
@@ -81,7 +74,7 @@
}
public static DatasourceAdapter getAdapter(MetadataTransactionContext mdTxnCtx, String dataverseName,
- String adapterName) throws MetadataException {
+ String adapterName) throws AlgebricksException {
DatasourceAdapter adapter;
// search in default namespace (built-in adapter)
adapter = MetadataManager.INSTANCE.getAdapter(mdTxnCtx, MetadataConstants.METADATA_DATAVERSE_NAME, adapterName);
@@ -95,11 +88,7 @@
public static Dataset findDataset(MetadataTransactionContext mdTxnCtx, String dataverse, String dataset)
throws AlgebricksException {
- try {
- return MetadataManager.INSTANCE.getDataset(mdTxnCtx, dataverse, dataset);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ return MetadataManager.INSTANCE.getDataset(mdTxnCtx, dataverse, dataset);
}
public static Dataset findExistingDataset(MetadataTransactionContext mdTxnCtx, String dataverseName,
@@ -131,47 +120,27 @@
public static Feed findFeed(MetadataTransactionContext mdTxnCtx, String dataverse, String feedName)
throws AlgebricksException {
- try {
- return MetadataManager.INSTANCE.getFeed(mdTxnCtx, dataverse, feedName);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ return MetadataManager.INSTANCE.getFeed(mdTxnCtx, dataverse, feedName);
}
public static FeedConnection findFeedConnection(MetadataTransactionContext mdTxnCtx, String dataverse,
String feedName, String datasetName) throws AlgebricksException {
- try {
- return MetadataManager.INSTANCE.getFeedConnection(mdTxnCtx, dataverse, feedName, datasetName);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ return MetadataManager.INSTANCE.getFeedConnection(mdTxnCtx, dataverse, feedName, datasetName);
}
public static FeedPolicyEntity findFeedPolicy(MetadataTransactionContext mdTxnCtx, String dataverse,
String policyName) throws AlgebricksException {
- try {
- return MetadataManager.INSTANCE.getFeedPolicy(mdTxnCtx, dataverse, policyName);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ return MetadataManager.INSTANCE.getFeedPolicy(mdTxnCtx, dataverse, policyName);
}
public static List<Index> getDatasetIndexes(MetadataTransactionContext mdTxnCtx, String dataverseName,
String datasetName) throws AlgebricksException {
- try {
- return MetadataManager.INSTANCE.getDatasetIndexes(mdTxnCtx, dataverseName, datasetName);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ return MetadataManager.INSTANCE.getDatasetIndexes(mdTxnCtx, dataverseName, datasetName);
}
public static DataSource findDataSource(IClusterStateManager clusterStateManager,
MetadataTransactionContext mdTxnCtx, DataSourceId id) throws AlgebricksException {
- try {
- return lookupSourceInMetadata(clusterStateManager, mdTxnCtx, id);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ return lookupSourceInMetadata(clusterStateManager, mdTxnCtx, id);
}
public static DataSource lookupSourceInMetadata(IClusterStateManager clusterStateManager,
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
index 2f94ad74..305cdfa 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
@@ -36,10 +36,8 @@
import org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.asterix.common.dataflow.LSMTreeInsertDeleteOperatorDescriptor;
import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.exceptions.CompilationException;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.metadata.LockList;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.StoragePathUtil;
import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory;
import org.apache.asterix.external.adapter.factory.LookupAdapterFactory;
@@ -57,7 +55,6 @@
import org.apache.asterix.external.util.ExternalDataConstants;
import org.apache.asterix.external.util.FeedConstants;
import org.apache.asterix.formats.base.IDataFormat;
-import org.apache.asterix.om.functions.IFunctionExtensionManager;
import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider;
import org.apache.asterix.formats.nontagged.LinearizeComparatorFactoryProvider;
import org.apache.asterix.formats.nontagged.TypeTraitProvider;
@@ -79,6 +76,7 @@
import org.apache.asterix.metadata.utils.MetadataConstants;
import org.apache.asterix.metadata.utils.SplitsAndConstraintsUtil;
import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.asterix.om.functions.IFunctionExtensionManager;
import org.apache.asterix.om.functions.IFunctionManager;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
@@ -87,6 +85,8 @@
import org.apache.asterix.runtime.base.AsterixTupleFilterFactory;
import org.apache.asterix.runtime.formats.FormatUtils;
import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
+import org.apache.asterix.runtime.operators.LSMIndexBulkLoadOperatorDescriptor;
+import org.apache.asterix.runtime.operators.LSMIndexBulkLoadOperatorDescriptor.BulkLoadUsage;
import org.apache.asterix.runtime.operators.LSMSecondaryUpsertOperatorDescriptor;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
@@ -133,7 +133,6 @@
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
-import org.apache.hyracks.storage.am.common.dataflow.TreeIndexBulkLoadOperatorDescriptor;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.invertedindex.dataflow.BinaryTokenizerOperatorDescriptor;
import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
@@ -157,9 +156,8 @@
private boolean asyncResults;
private ResultSetId resultSetId;
private IResultSerializerFactoryProvider resultSerializerFactoryProvider;
- private JobId jobId;
+ private TxnId txnId;
private Map<String, Integer> externalDataLocks;
- private boolean isTemporaryDatasetWriteJob = true;
private boolean blockingOperatorDisabled = false;
public MetadataProvider(ICcApplicationContext appCtx, Dataverse defaultDataverse) {
@@ -189,8 +187,8 @@
return config;
}
- public void setJobId(JobId jobId) {
- this.jobId = jobId;
+ public void setTxnId(TxnId txnId) {
+ this.txnId = txnId;
}
public Dataverse getDefaultDataverse() {
@@ -258,11 +256,6 @@
return isWriteTransaction;
}
- public boolean isTemporaryDatasetWriteJob() {
- // The transaction only writes temporary datasets.
- return isTemporaryDatasetWriteJob;
- }
-
public IFunctionManager getFunctionManager() {
return functionManager;
}
@@ -398,7 +391,7 @@
return new Pair<>(dataScanner, constraint);
}
- public Dataverse findDataverse(String dataverseName) throws CompilationException {
+ public Dataverse findDataverse(String dataverseName) throws AlgebricksException {
return MetadataManager.INSTANCE.getDataverse(mdTxnCtx, dataverseName);
}
@@ -436,47 +429,39 @@
boolean lowKeyInclusive, boolean highKeyInclusive, boolean propagateFilter, int[] minFilterFieldIndexes,
int[] maxFilterFieldIndexes) throws AlgebricksException {
boolean isSecondary = true;
- try {
- Index primaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), dataset.getDatasetName());
- if (primaryIndex != null && (dataset.getDatasetType() != DatasetType.EXTERNAL)) {
- isSecondary = !indexName.equals(primaryIndex.getIndexName());
- }
- Index theIndex =
- isSecondary
- ? MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), indexName)
- : primaryIndex;
- int numPrimaryKeys = dataset.getPrimaryKeys().size();
- RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc =
- getSplitProviderAndConstraints(dataset, theIndex.getIndexName());
- int[] primaryKeyFields = new int[numPrimaryKeys];
- for (int i = 0; i < numPrimaryKeys; i++) {
- primaryKeyFields[i] = i;
- }
-
- ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory(
- storageComponentProvider, theIndex, jobId, IndexOperation.SEARCH, primaryKeyFields);
- IStorageManager storageManager = getStorageComponentProvider().getStorageManager();
- IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(storageManager, spPc.first);
- BTreeSearchOperatorDescriptor btreeSearchOp;
- if (dataset.getDatasetType() == DatasetType.INTERNAL) {
- btreeSearchOp = new BTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, lowKeyFields, highKeyFields,
- lowKeyInclusive, highKeyInclusive, indexHelperFactory, retainInput, retainMissing,
- context.getMissingWriterFactory(), searchCallbackFactory, minFilterFieldIndexes,
- maxFilterFieldIndexes, propagateFilter);
- } else {
- btreeSearchOp = new ExternalBTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, lowKeyFields,
- highKeyFields, lowKeyInclusive, highKeyInclusive, indexHelperFactory, retainInput,
- retainMissing, context.getMissingWriterFactory(), searchCallbackFactory, minFilterFieldIndexes,
- maxFilterFieldIndexes,
- ExternalDatasetsRegistry.INSTANCE.getAndLockDatasetVersion(dataset, this));
- }
- return new Pair<>(btreeSearchOp, spPc.second);
- } catch (MetadataException me) {
- throw new AlgebricksException(me);
+ Index primaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), dataset.getDatasetName());
+ if (primaryIndex != null && (dataset.getDatasetType() != DatasetType.EXTERNAL)) {
+ isSecondary = !indexName.equals(primaryIndex.getIndexName());
}
+ Index theIndex = isSecondary ? MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), indexName) : primaryIndex;
+ int numPrimaryKeys = dataset.getPrimaryKeys().size();
+ RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc =
+ getSplitProviderAndConstraints(dataset, theIndex.getIndexName());
+ int[] primaryKeyFields = new int[numPrimaryKeys];
+ for (int i = 0; i < numPrimaryKeys; i++) {
+ primaryKeyFields[i] = i;
+ }
+
+ ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory(
+ storageComponentProvider, theIndex, txnId, IndexOperation.SEARCH, primaryKeyFields);
+ IStorageManager storageManager = getStorageComponentProvider().getStorageManager();
+ IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(storageManager, spPc.first);
+ BTreeSearchOperatorDescriptor btreeSearchOp;
+ if (dataset.getDatasetType() == DatasetType.INTERNAL) {
+ btreeSearchOp = new BTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, lowKeyFields, highKeyFields,
+ lowKeyInclusive, highKeyInclusive, indexHelperFactory, retainInput, retainMissing,
+ context.getMissingWriterFactory(), searchCallbackFactory, minFilterFieldIndexes,
+ maxFilterFieldIndexes, propagateFilter);
+ } else {
+ btreeSearchOp = new ExternalBTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, lowKeyFields,
+ highKeyFields, lowKeyInclusive, highKeyInclusive, indexHelperFactory, retainInput, retainMissing,
+ context.getMissingWriterFactory(), searchCallbackFactory, minFilterFieldIndexes,
+ maxFilterFieldIndexes, ExternalDatasetsRegistry.INSTANCE.getAndLockDatasetVersion(dataset, this));
+ }
+ return new Pair<>(btreeSearchOp, spPc.second);
}
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> buildRtreeRuntime(JobSpecification jobSpec,
@@ -484,43 +469,39 @@
JobGenContext context, boolean retainInput, boolean retainMissing, Dataset dataset, String indexName,
int[] keyFields, boolean propagateFilter, int[] minFilterFieldIndexes, int[] maxFilterFieldIndexes)
throws AlgebricksException {
- try {
- int numPrimaryKeys = dataset.getPrimaryKeys().size();
- Index secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), indexName);
- if (secondaryIndex == null) {
- throw new AlgebricksException(
- "Code generation error: no index " + indexName + " for dataset " + dataset.getDatasetName());
- }
- RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc =
- getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName());
- int[] primaryKeyFields = new int[numPrimaryKeys];
- for (int i = 0; i < numPrimaryKeys; i++) {
- primaryKeyFields[i] = i;
- }
-
- ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory(
- storageComponentProvider, secondaryIndex, jobId, IndexOperation.SEARCH, primaryKeyFields);
- RTreeSearchOperatorDescriptor rtreeSearchOp;
- IIndexDataflowHelperFactory indexDataflowHelperFactory =
- new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), spPc.first);
- if (dataset.getDatasetType() == DatasetType.INTERNAL) {
- rtreeSearchOp = new RTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, keyFields, true, true,
- indexDataflowHelperFactory, retainInput, retainMissing, context.getMissingWriterFactory(),
- searchCallbackFactory, minFilterFieldIndexes, maxFilterFieldIndexes, propagateFilter);
- } else {
- // Create the operator
- rtreeSearchOp = new ExternalRTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, keyFields, true, true,
- indexDataflowHelperFactory, retainInput, retainMissing, context.getMissingWriterFactory(),
- searchCallbackFactory, minFilterFieldIndexes, maxFilterFieldIndexes,
- ExternalDatasetsRegistry.INSTANCE.getAndLockDatasetVersion(dataset, this));
- }
-
- return new Pair<>(rtreeSearchOp, spPc.second);
- } catch (MetadataException me) {
- throw new AlgebricksException(me);
+ int numPrimaryKeys = dataset.getPrimaryKeys().size();
+ Index secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), indexName);
+ if (secondaryIndex == null) {
+ throw new AlgebricksException(
+ "Code generation error: no index " + indexName + " for dataset " + dataset.getDatasetName());
}
+ RecordDescriptor outputRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> spPc =
+ getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName());
+ int[] primaryKeyFields = new int[numPrimaryKeys];
+ for (int i = 0; i < numPrimaryKeys; i++) {
+ primaryKeyFields[i] = i;
+ }
+
+ ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory(
+ storageComponentProvider, secondaryIndex, txnId, IndexOperation.SEARCH, primaryKeyFields);
+ RTreeSearchOperatorDescriptor rtreeSearchOp;
+ IIndexDataflowHelperFactory indexDataflowHelperFactory =
+ new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), spPc.first);
+ if (dataset.getDatasetType() == DatasetType.INTERNAL) {
+ rtreeSearchOp = new RTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, keyFields, true, true,
+ indexDataflowHelperFactory, retainInput, retainMissing, context.getMissingWriterFactory(),
+ searchCallbackFactory, minFilterFieldIndexes, maxFilterFieldIndexes, propagateFilter);
+ } else {
+ // Create the operator
+ rtreeSearchOp = new ExternalRTreeSearchOperatorDescriptor(jobSpec, outputRecDesc, keyFields, true, true,
+ indexDataflowHelperFactory, retainInput, retainMissing, context.getMissingWriterFactory(),
+ searchCallbackFactory, minFilterFieldIndexes, maxFilterFieldIndexes,
+ ExternalDatasetsRegistry.INSTANCE.getAndLockDatasetVersion(dataset, this));
+ }
+
+ return new Pair<>(rtreeSearchOp, spPc.second);
}
@Override
@@ -582,26 +563,20 @@
fieldPermutation[numKeys + 1] = idx;
}
- try {
- boolean temp = dataset.getDatasetDetails().isTemp();
- isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob && temp;
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
- getSplitProviderAndConstraints(dataset);
- long numElementsHint = getCardinalityPerPartitionHint(dataset);
- // TODO
- // figure out the right behavior of the bulkload and then give the
- // right callback
- // (ex. what's the expected behavior when there is an error during
- // bulkload?)
- IIndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(
- storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
- TreeIndexBulkLoadOperatorDescriptor btreeBulkLoad =
- new TreeIndexBulkLoadOperatorDescriptor(spec, null, fieldPermutation,
- GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, true, indexHelperFactory);
- return new Pair<>(btreeBulkLoad, splitsAndConstraint.second);
- } catch (MetadataException me) {
- throw new AlgebricksException(me);
- }
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
+ getSplitProviderAndConstraints(dataset);
+ long numElementsHint = getCardinalityPerPartitionHint(dataset);
+ // TODO
+ // figure out the right behavior of the bulkload and then give the
+ // right callback
+ // (ex. what's the expected behavior when there is an error during
+ // bulkload?)
+ IIndexDataflowHelperFactory indexHelperFactory =
+ new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
+ LSMIndexBulkLoadOperatorDescriptor btreeBulkLoad = new LSMIndexBulkLoadOperatorDescriptor(spec, null,
+ fieldPermutation, GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, true,
+ indexHelperFactory, null, BulkLoadUsage.LOAD, dataset.getDatasetId());
+ return new Pair<>(btreeBulkLoad, splitsAndConstraint.second);
}
@Override
@@ -679,13 +654,8 @@
}
Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataverseName, datasetName);
- Index secondaryIndex;
- try {
- secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), indexName);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ Index secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), indexName);
// TokenizeOperator only supports a keyword or n-gram index.
switch (secondaryIndex.getIndexType()) {
case SINGLE_PARTITION_WORD_INVIX:
@@ -702,8 +672,8 @@
/**
* Calculate an estimate size of the bloom filter. Note that this is an
- * estimation which assumes that the data is going to be uniformly
- * distributed across all partitions.
+ * estimation which assumes that the data is going to be uniformly distributed
+ * across all partitions.
*
* @param dataset
* @return Number of elements that will be used to create a bloom filter per
@@ -757,8 +727,8 @@
}
}
- public JobId getJobId() {
- return jobId;
+ public TxnId getTxnId() {
+ return txnId;
}
public static ILinearizeComparatorFactory proposeLinearizer(ATypeTag keyType, int numKeyFields)
@@ -778,7 +748,7 @@
}
public DatasourceAdapter getAdapter(MetadataTransactionContext mdTxnCtx, String dataverseName, String adapterName)
- throws MetadataException {
+ throws AlgebricksException {
DatasourceAdapter adapter;
// search in default namespace (built-in adapter)
adapter = MetadataManager.INSTANCE.getAdapter(mdTxnCtx, MetadataConstants.METADATA_DATAVERSE_NAME, adapterName);
@@ -815,10 +785,11 @@
// Create the file index data flow helper
IIndexDataflowHelperFactory indexDataflowHelperFactory =
new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), spPc.first);
- // Create the out record descriptor, appContext and fileSplitProvider for the files index
+ // Create the out record descriptor, appContext and fileSplitProvider for the
+ // files index
RecordDescriptor outRecDesc = JobGenHelper.mkRecordDescriptor(typeEnv, opSchema, context);
ISearchOperationCallbackFactory searchOpCallbackFactory = dataset
- .getSearchCallbackFactory(storageComponentProvider, fileIndex, jobId, IndexOperation.SEARCH, null);
+ .getSearchCallbackFactory(storageComponentProvider, fileIndex, txnId, IndexOperation.SEARCH, null);
// Create the operator
ExternalLookupOperatorDescriptor op = new ExternalLookupOperatorDescriptor(jobSpec, adapterFactory,
outRecDesc, indexDataflowHelperFactory, searchOpCallbackFactory,
@@ -841,8 +812,6 @@
throw new AlgebricksException(
"Unknown dataset " + datasetName + " in dataverse " + dataSource.getId().getDataverseName());
}
- boolean temp = dataset.getDatasetDetails().isTemp();
- isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob && temp;
int numKeys = primaryKeys.size();
int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1;
int numOfAdditionalFields = additionalNonFilterFields == null ? 0 : additionalNonFilterFields.size();
@@ -876,8 +845,7 @@
}
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> buildExternalDatasetDataScannerRuntime(
- JobSpecification jobSpec, IAType itemType, IAdapterFactory adapterFactory)
- throws AlgebricksException {
+ JobSpecification jobSpec, IAType itemType, IAdapterFactory adapterFactory) throws AlgebricksException {
if (itemType.getTypeTag() != ATypeTag.OBJECT) {
throw new AlgebricksException("Can only scan datasets of records.");
}
@@ -955,9 +923,6 @@
String datasetName = dataSource.getId().getDatasourceName();
Dataset dataset =
MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataSource.getId().getDataverseName(), datasetName);
- boolean temp = dataset.getDatasetDetails().isTemp();
- isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob && temp;
-
int numKeys = keys.size();
int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1;
// Move key fields to front.
@@ -983,34 +948,31 @@
}
}
- try {
- Index primaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), dataset.getDatasetName());
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
- getSplitProviderAndConstraints(dataset);
+ Index primaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), dataset.getDatasetName());
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
+ getSplitProviderAndConstraints(dataset);
- // prepare callback
- int[] primaryKeyFields = new int[numKeys];
- for (i = 0; i < numKeys; i++) {
- primaryKeyFields[i] = i;
- }
- IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
- storageComponentProvider, primaryIndex, jobId, indexOp, primaryKeyFields);
- IIndexDataflowHelperFactory idfh = new IndexDataflowHelperFactory(
- storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
- IOperatorDescriptor op;
- if (bulkload) {
- long numElementsHint = getCardinalityPerPartitionHint(dataset);
- op = new TreeIndexBulkLoadOperatorDescriptor(spec, inputRecordDesc, fieldPermutation,
- GlobalConfig.DEFAULT_TREE_FILL_FACTOR, true, numElementsHint, true, idfh);
- } else {
- op = new LSMTreeInsertDeleteOperatorDescriptor(spec, inputRecordDesc, fieldPermutation, indexOp, idfh,
- null, true, modificationCallbackFactory);
- }
- return new Pair<>(op, splitsAndConstraint.second);
- } catch (MetadataException me) {
- throw new AlgebricksException(me);
+ // prepare callback
+ int[] primaryKeyFields = new int[numKeys];
+ for (i = 0; i < numKeys; i++) {
+ primaryKeyFields[i] = i;
}
+ IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
+ storageComponentProvider, primaryIndex, txnId, indexOp, primaryKeyFields);
+ IIndexDataflowHelperFactory idfh =
+ new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
+ IOperatorDescriptor op;
+ if (bulkload) {
+ long numElementsHint = getCardinalityPerPartitionHint(dataset);
+ op = new LSMIndexBulkLoadOperatorDescriptor(spec, inputRecordDesc, fieldPermutation,
+ GlobalConfig.DEFAULT_TREE_FILL_FACTOR, true, numElementsHint, true, idfh, null, BulkLoadUsage.LOAD,
+ dataset.getDatasetId());
+ } else {
+ op = new LSMTreeInsertDeleteOperatorDescriptor(spec, inputRecordDesc, fieldPermutation, indexOp, idfh, null,
+ true, modificationCallbackFactory);
+ }
+ return new Pair<>(op, splitsAndConstraint.second);
}
private Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getIndexInsertOrDeleteOrUpsertRuntime(
@@ -1026,13 +988,8 @@
String datasetName = dataSourceIndex.getDataSource().getId().getDatasourceName();
Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataverseName, datasetName);
- Index secondaryIndex;
- try {
- secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), indexName);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
- }
+ Index secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), indexName);
ArrayList<LogicalVariable> prevAdditionalFilteringKeys = null;
if (indexOp == IndexOperation.UPSERT && prevAdditionalFilteringKey != null) {
@@ -1070,9 +1027,6 @@
JobSpecification spec, IndexOperation indexOp, boolean bulkload, List<LogicalVariable> prevSecondaryKeys,
List<LogicalVariable> prevAdditionalFilteringKeys) throws AlgebricksException {
Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataverseName, datasetName);
- boolean temp = dataset.getDatasetDetails().isTemp();
- isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob && temp;
-
int numKeys = primaryKeys.size() + secondaryKeys.size();
int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1;
@@ -1127,16 +1081,17 @@
Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName());
// prepare callback
- JobId jobId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getJobId();
+ TxnId txnId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getTxnId();
IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
- storageComponentProvider, secondaryIndex, jobId, indexOp, modificationCallbackPrimaryKeyFields);
+ storageComponentProvider, secondaryIndex, txnId, indexOp, modificationCallbackPrimaryKeyFields);
IIndexDataflowHelperFactory idfh = new IndexDataflowHelperFactory(
storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
IOperatorDescriptor op;
if (bulkload) {
long numElementsHint = getCardinalityPerPartitionHint(dataset);
- op = new TreeIndexBulkLoadOperatorDescriptor(spec, inputRecordDesc, fieldPermutation,
- GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, false, idfh);
+ op = new LSMIndexBulkLoadOperatorDescriptor(spec, inputRecordDesc, fieldPermutation,
+ GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, false, idfh, null,
+ BulkLoadUsage.LOAD, dataset.getDatasetId());
} else if (indexOp == IndexOperation.UPSERT) {
op = new LSMSecondaryUpsertOperatorDescriptor(spec, inputRecordDesc, fieldPermutation, idfh,
filterFactory, modificationCallbackFactory, prevFieldPermutation);
@@ -1156,101 +1111,93 @@
AsterixTupleFilterFactory filterFactory, RecordDescriptor recordDesc, JobGenContext context,
JobSpecification spec, IndexOperation indexOp, boolean bulkload, List<LogicalVariable> prevSecondaryKeys,
List<LogicalVariable> prevAdditionalFilteringKeys) throws AlgebricksException {
+ Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataverseName, datasetName);
+ String itemTypeName = dataset.getItemTypeName();
+ IAType itemType = MetadataManager.INSTANCE
+ .getDatatype(mdTxnCtx, dataset.getItemTypeDataverseName(), itemTypeName).getDatatype();
+ validateRecordType(itemType);
+ ARecordType recType = (ARecordType) itemType;
+ Index secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
+ dataset.getDatasetName(), indexName);
+ List<List<String>> secondaryKeyExprs = secondaryIndex.getKeyFieldNames();
+ List<IAType> secondaryKeyTypes = secondaryIndex.getKeyFieldTypes();
+ Pair<IAType, Boolean> keyPairType =
+ Index.getNonNullableOpenFieldType(secondaryKeyTypes.get(0), secondaryKeyExprs.get(0), recType);
+ IAType spatialType = keyPairType.first;
+ int dimension = NonTaggedFormatUtil.getNumDimensions(spatialType.getTypeTag());
+ int numSecondaryKeys = dimension * 2;
+ int numPrimaryKeys = primaryKeys.size();
+ int numKeys = numSecondaryKeys + numPrimaryKeys;
- try {
- Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataverseName, datasetName);
- boolean temp = dataset.getDatasetDetails().isTemp();
- isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob && temp;
+ int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1;
+ int[] fieldPermutation = new int[numKeys + numFilterFields];
+ int[] modificationCallbackPrimaryKeyFields = new int[primaryKeys.size()];
+ int i = 0;
+ int j = 0;
- String itemTypeName = dataset.getItemTypeName();
- IAType itemType = MetadataManager.INSTANCE
- .getDatatype(mdTxnCtx, dataset.getItemTypeDataverseName(), itemTypeName).getDatatype();
- validateRecordType(itemType);
- ARecordType recType = (ARecordType) itemType;
- Index secondaryIndex = MetadataManager.INSTANCE.getIndex(mdTxnCtx, dataset.getDataverseName(),
- dataset.getDatasetName(), indexName);
- List<List<String>> secondaryKeyExprs = secondaryIndex.getKeyFieldNames();
- List<IAType> secondaryKeyTypes = secondaryIndex.getKeyFieldTypes();
- Pair<IAType, Boolean> keyPairType =
- Index.getNonNullableOpenFieldType(secondaryKeyTypes.get(0), secondaryKeyExprs.get(0), recType);
- IAType spatialType = keyPairType.first;
- int dimension = NonTaggedFormatUtil.getNumDimensions(spatialType.getTypeTag());
- int numSecondaryKeys = dimension * 2;
- int numPrimaryKeys = primaryKeys.size();
- int numKeys = numSecondaryKeys + numPrimaryKeys;
+ for (LogicalVariable varKey : secondaryKeys) {
+ int idx = propagatedSchema.findVariable(varKey);
+ fieldPermutation[i] = idx;
+ i++;
+ }
+ for (LogicalVariable varKey : primaryKeys) {
+ int idx = propagatedSchema.findVariable(varKey);
+ fieldPermutation[i] = idx;
+ modificationCallbackPrimaryKeyFields[j] = i;
+ i++;
+ j++;
+ }
- int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1;
- int[] fieldPermutation = new int[numKeys + numFilterFields];
- int[] modificationCallbackPrimaryKeyFields = new int[primaryKeys.size()];
- int i = 0;
- int j = 0;
+ if (numFilterFields > 0) {
+ int idx = propagatedSchema.findVariable(additionalNonKeyFields.get(0));
+ fieldPermutation[numKeys] = idx;
+ }
- for (LogicalVariable varKey : secondaryKeys) {
+ int[] prevFieldPermutation = null;
+ if (indexOp == IndexOperation.UPSERT) {
+ // Get field permutation for previous value
+ prevFieldPermutation = new int[numKeys + numFilterFields];
+ i = 0;
+
+ // Get field permutation for new value
+ for (LogicalVariable varKey : prevSecondaryKeys) {
int idx = propagatedSchema.findVariable(varKey);
- fieldPermutation[i] = idx;
+ prevFieldPermutation[i] = idx;
i++;
}
- for (LogicalVariable varKey : primaryKeys) {
- int idx = propagatedSchema.findVariable(varKey);
- fieldPermutation[i] = idx;
- modificationCallbackPrimaryKeyFields[j] = i;
+ for (int k = 0; k < numPrimaryKeys; k++) {
+ prevFieldPermutation[k + i] = fieldPermutation[k + i];
i++;
- j++;
}
if (numFilterFields > 0) {
- int idx = propagatedSchema.findVariable(additionalNonKeyFields.get(0));
- fieldPermutation[numKeys] = idx;
+ int idx = propagatedSchema.findVariable(prevAdditionalFilteringKeys.get(0));
+ prevFieldPermutation[numKeys] = idx;
}
-
- int[] prevFieldPermutation = null;
- if (indexOp == IndexOperation.UPSERT) {
- // Get field permutation for previous value
- prevFieldPermutation = new int[numKeys + numFilterFields];
- i = 0;
-
- // Get field permutation for new value
- for (LogicalVariable varKey : prevSecondaryKeys) {
- int idx = propagatedSchema.findVariable(varKey);
- prevFieldPermutation[i] = idx;
- i++;
- }
- for (int k = 0; k < numPrimaryKeys; k++) {
- prevFieldPermutation[k + i] = fieldPermutation[k + i];
- i++;
- }
-
- if (numFilterFields > 0) {
- int idx = propagatedSchema.findVariable(prevAdditionalFilteringKeys.get(0));
- prevFieldPermutation[numKeys] = idx;
- }
- }
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
- getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName());
-
- // prepare callback
- JobId jobId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getJobId();
- IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
- storageComponentProvider, secondaryIndex, jobId, indexOp, modificationCallbackPrimaryKeyFields);
- IIndexDataflowHelperFactory indexDataflowHelperFactory = new IndexDataflowHelperFactory(
- storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
- IOperatorDescriptor op;
- if (bulkload) {
- long numElementsHint = getCardinalityPerPartitionHint(dataset);
- op = new TreeIndexBulkLoadOperatorDescriptor(spec, recordDesc, fieldPermutation,
- GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, false,
- indexDataflowHelperFactory);
- } else if (indexOp == IndexOperation.UPSERT) {
- op = new LSMSecondaryUpsertOperatorDescriptor(spec, recordDesc, fieldPermutation,
- indexDataflowHelperFactory, filterFactory, modificationCallbackFactory, prevFieldPermutation);
- } else {
- op = new LSMTreeInsertDeleteOperatorDescriptor(spec, recordDesc, fieldPermutation, indexOp,
- indexDataflowHelperFactory, filterFactory, false, modificationCallbackFactory);
- }
- return new Pair<>(op, splitsAndConstraint.second);
- } catch (MetadataException e) {
- throw new AlgebricksException(e);
}
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
+ getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName());
+
+ // prepare callback
+ TxnId planTxnId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getTxnId();
+ IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
+ storageComponentProvider, secondaryIndex, planTxnId, indexOp, modificationCallbackPrimaryKeyFields);
+ IIndexDataflowHelperFactory indexDataflowHelperFactory =
+ new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
+ IOperatorDescriptor op;
+ if (bulkload) {
+ long numElementsHint = getCardinalityPerPartitionHint(dataset);
+ op = new LSMIndexBulkLoadOperatorDescriptor(spec, recordDesc, fieldPermutation,
+ GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, false, indexDataflowHelperFactory,
+ null, BulkLoadUsage.LOAD, dataset.getDatasetId());
+ } else if (indexOp == IndexOperation.UPSERT) {
+ op = new LSMSecondaryUpsertOperatorDescriptor(spec, recordDesc, fieldPermutation,
+ indexDataflowHelperFactory, filterFactory, modificationCallbackFactory, prevFieldPermutation);
+ } else {
+ op = new LSMTreeInsertDeleteOperatorDescriptor(spec, recordDesc, fieldPermutation, indexOp,
+ indexDataflowHelperFactory, filterFactory, false, modificationCallbackFactory);
+ }
+ return new Pair<>(op, splitsAndConstraint.second);
}
private Pair<IOperatorDescriptor, AlgebricksPartitionConstraint> getInvertedIndexRuntime(String dataverseName,
@@ -1279,9 +1226,6 @@
throw new AlgebricksException("Cannot create composite inverted index on multiple fields.");
}
Dataset dataset = MetadataManagerUtil.findExistingDataset(mdTxnCtx, dataverseName, datasetName);
- boolean temp = dataset.getDatasetDetails().isTemp();
- isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob && temp;
-
// For tokenization, sorting and loading.
// One token (+ optional partitioning field) + primary keys: [token,
// number of token, PK]
@@ -1345,16 +1289,17 @@
getSplitProviderAndConstraints(dataset, secondaryIndex.getIndexName());
// prepare callback
- JobId jobId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getJobId();
+ TxnId txnId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getTxnId();
IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
- storageComponentProvider, secondaryIndex, jobId, indexOp, modificationCallbackPrimaryKeyFields);
+ storageComponentProvider, secondaryIndex, txnId, indexOp, modificationCallbackPrimaryKeyFields);
IIndexDataflowHelperFactory indexDataFlowFactory = new IndexDataflowHelperFactory(
storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
IOperatorDescriptor op;
if (bulkload) {
long numElementsHint = getCardinalityPerPartitionHint(dataset);
- op = new TreeIndexBulkLoadOperatorDescriptor(spec, recordDesc, fieldPermutation,
- GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, false, indexDataFlowFactory);
+ op = new LSMIndexBulkLoadOperatorDescriptor(spec, recordDesc, fieldPermutation,
+ GlobalConfig.DEFAULT_TREE_FILL_FACTOR, false, numElementsHint, false, indexDataFlowFactory,
+ null, BulkLoadUsage.LOAD, dataset.getDatasetId());
} else if (indexOp == IndexOperation.UPSERT) {
op = new LSMSecondaryUpsertOperatorDescriptor(spec, recordDesc, fieldPermutation, indexDataFlowFactory,
filterFactory, modificationCallbackFactory, prevFieldPermutation);
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/BuiltinTypeMap.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/BuiltinTypeMap.java
index 1f0a08e..a531add 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/BuiltinTypeMap.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/BuiltinTypeMap.java
@@ -26,11 +26,12 @@
import java.util.Set;
import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.MetadataNode;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
/**
* Maps from a string representation of an Asterix type to an Asterix type.
@@ -92,12 +93,12 @@
return new HashSet<>(_builtinTypeMap.values());
}
- public static IAType getTypeFromTypeName(MetadataNode metadataNode, JobId jobId, String dataverseName,
- String typeName, boolean optional) throws MetadataException {
+ public static IAType getTypeFromTypeName(MetadataNode metadataNode, TxnId txnId, String dataverseName,
+ String typeName, boolean optional) throws AlgebricksException {
IAType type = _builtinTypeMap.get(typeName);
if (type == null) {
try {
- Datatype dt = metadataNode.getDatatype(jobId, dataverseName, typeName);
+ Datatype dt = metadataNode.getDatatype(txnId, dataverseName, typeName);
type = dt.getDatatype();
} catch (RemoteException e) {
throw new MetadataException(e);
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java
index 8e1c34d..e6c0de8 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/Dataset.java
@@ -31,6 +31,7 @@
import org.apache.asterix.active.IActiveNotificationHandler;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.context.CorrelatedPrefixMergePolicyFactory;
+import org.apache.asterix.common.context.DatasetLSMComponentIdGeneratorFactory;
import org.apache.asterix.common.context.IStorageComponentProvider;
import org.apache.asterix.common.dataflow.NoOpFrameOperationCallbackFactory;
import org.apache.asterix.common.exceptions.CompilationException;
@@ -41,7 +42,7 @@
import org.apache.asterix.common.ioopcallbacks.LSMRTreeIOOperationCallbackFactory;
import org.apache.asterix.common.metadata.IDataset;
import org.apache.asterix.common.transactions.IRecoveryManager.ResourceType;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.JobUtils;
import org.apache.asterix.common.utils.JobUtils.ProgressState;
import org.apache.asterix.external.feed.management.FeedConnectionId;
@@ -75,8 +76,6 @@
import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexModificationOperationCallbackFactory;
import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexOperationTrackerFactory;
import org.apache.asterix.transaction.management.opcallbacks.SecondaryIndexSearchOperationCallbackFactory;
-import org.apache.asterix.transaction.management.opcallbacks.TempDatasetPrimaryIndexModificationOperationCallbackFactory;
-import org.apache.asterix.transaction.management.opcallbacks.TempDatasetSecondaryIndexModificationOperationCallbackFactory;
import org.apache.asterix.transaction.management.opcallbacks.UpsertOperationCallbackFactory;
import org.apache.asterix.transaction.management.resource.DatasetLocalResourceFactory;
import org.apache.asterix.transaction.management.runtime.CommitRuntimeFactory;
@@ -107,6 +106,7 @@
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.IFrameOperationCallbackFactory;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTrackerFactory;
@@ -505,15 +505,15 @@
case BTREE:
return getDatasetType() == DatasetType.EXTERNAL
&& !index.getIndexName().equals(IndexingConstants.getFilesIndexName(getDatasetName()))
- ? LSMBTreeWithBuddyIOOperationCallbackFactory.INSTANCE
- : LSMBTreeIOOperationCallbackFactory.INSTANCE;
+ ? new LSMBTreeWithBuddyIOOperationCallbackFactory(getComponentIdGeneratorFactory())
+ : new LSMBTreeIOOperationCallbackFactory(getComponentIdGeneratorFactory());
case RTREE:
- return LSMRTreeIOOperationCallbackFactory.INSTANCE;
+ return new LSMRTreeIOOperationCallbackFactory(getComponentIdGeneratorFactory());
case LENGTH_PARTITIONED_NGRAM_INVIX:
case LENGTH_PARTITIONED_WORD_INVIX:
case SINGLE_PARTITION_NGRAM_INVIX:
case SINGLE_PARTITION_WORD_INVIX:
- return LSMInvertedIndexIOOperationCallbackFactory.INSTANCE;
+ return new LSMInvertedIndexIOOperationCallbackFactory(getComponentIdGeneratorFactory());
default:
throw new CompilationException(ErrorCode.COMPILATION_UNKNOWN_INDEX_TYPE,
index.getIndexType().toString());
@@ -532,12 +532,16 @@
: new SecondaryIndexOperationTrackerFactory(getDatasetId());
}
+ public ILSMComponentIdGeneratorFactory getComponentIdGeneratorFactory() {
+ return new DatasetLSMComponentIdGeneratorFactory(getDatasetId());
+ }
+
/**
* Get search callback factory for this dataset with the passed index and operation
*
* @param index
* the index
- * @param jobId
+ * @param txnId
* the job id being compiled
* @param op
* the operation this search is part of
@@ -549,19 +553,22 @@
* if the callback factory could not be created
*/
public ISearchOperationCallbackFactory getSearchCallbackFactory(IStorageComponentProvider storageComponentProvider,
- Index index, JobId jobId, IndexOperation op, int[] primaryKeyFields) throws AlgebricksException {
- if (getDatasetDetails().isTemp()) {
- return NoOpOperationCallbackFactory.INSTANCE;
- } else if (index.isPrimaryIndex()) {
- /**
+ Index index, TxnId txnId, IndexOperation op, int[] primaryKeyFields) throws AlgebricksException {
+ if (index.isPrimaryIndex()) {
+ /*
* Due to the read-committed isolation level,
* we may acquire very short duration lock(i.e., instant lock) for readers.
*/
- return (op == IndexOperation.UPSERT)
- ? new LockThenSearchOperationCallbackFactory(jobId, getDatasetId(), primaryKeyFields,
- storageComponentProvider.getTransactionSubsystemProvider(), ResourceType.LSM_BTREE)
- : new PrimaryIndexInstantSearchOperationCallbackFactory(jobId, getDatasetId(), primaryKeyFields,
+ return (op == IndexOperation.UPSERT) ?
+ new LockThenSearchOperationCallbackFactory(txnId, getDatasetId(), primaryKeyFields,
+ storageComponentProvider.getTransactionSubsystemProvider(), ResourceType.LSM_BTREE) :
+ new PrimaryIndexInstantSearchOperationCallbackFactory(txnId, getDatasetId(), primaryKeyFields,
storageComponentProvider.getTransactionSubsystemProvider(), ResourceType.LSM_BTREE);
+ } else if (index.getKeyFieldNames().isEmpty()) {
+ // this is the case where the index is secondary primary index and locking is required
+ // since the secondary primary index replaces the dataset index (which locks)
+ return new PrimaryIndexInstantSearchOperationCallbackFactory(txnId, getDatasetId(), primaryKeyFields,
+ storageComponentProvider.getTransactionSubsystemProvider(), ResourceType.LSM_BTREE);
}
return new SecondaryIndexSearchOperationCallbackFactory();
}
@@ -571,7 +578,7 @@
*
* @param index
* the index
- * @param jobId
+ * @param txnId
* the job id of the job being compiled
* @param op
* the operation performed for this callback
@@ -583,34 +590,24 @@
* If the callback factory could not be created
*/
public IModificationOperationCallbackFactory getModificationCallbackFactory(
- IStorageComponentProvider componentProvider, Index index, JobId jobId, IndexOperation op,
+ IStorageComponentProvider componentProvider, Index index, TxnId txnId, IndexOperation op,
int[] primaryKeyFields) throws AlgebricksException {
- if (getDatasetDetails().isTemp()) {
- return op == IndexOperation.DELETE || op == IndexOperation.INSERT || op == IndexOperation.UPSERT
- ? index.isPrimaryIndex()
- ? new TempDatasetPrimaryIndexModificationOperationCallbackFactory(jobId, datasetId,
- primaryKeyFields, componentProvider.getTransactionSubsystemProvider(),
- Operation.get(op), index.resourceType())
- : new TempDatasetSecondaryIndexModificationOperationCallbackFactory(jobId, getDatasetId(),
- primaryKeyFields, componentProvider.getTransactionSubsystemProvider(),
- Operation.get(op), index.resourceType())
- : NoOpOperationCallbackFactory.INSTANCE;
- } else if (index.isPrimaryIndex()) {
- return op == IndexOperation.UPSERT
- ? new UpsertOperationCallbackFactory(jobId, getDatasetId(), primaryKeyFields,
+ if (index.isPrimaryIndex()) {
+ return op == IndexOperation.UPSERT ?
+ new UpsertOperationCallbackFactory(txnId, getDatasetId(), primaryKeyFields,
componentProvider.getTransactionSubsystemProvider(), Operation.get(op),
- index.resourceType())
- : op == IndexOperation.DELETE || op == IndexOperation.INSERT
- ? new PrimaryIndexModificationOperationCallbackFactory(jobId, getDatasetId(),
+ index.resourceType()) :
+ op == IndexOperation.DELETE || op == IndexOperation.INSERT ?
+ new PrimaryIndexModificationOperationCallbackFactory(txnId, getDatasetId(),
primaryKeyFields, componentProvider.getTransactionSubsystemProvider(),
- Operation.get(op), index.resourceType())
- : NoOpOperationCallbackFactory.INSTANCE;
+ Operation.get(op), index.resourceType()) :
+ NoOpOperationCallbackFactory.INSTANCE;
} else {
- return op == IndexOperation.DELETE || op == IndexOperation.INSERT || op == IndexOperation.UPSERT
- ? new SecondaryIndexModificationOperationCallbackFactory(jobId, getDatasetId(), primaryKeyFields,
+ return op == IndexOperation.DELETE || op == IndexOperation.INSERT || op == IndexOperation.UPSERT ?
+ new SecondaryIndexModificationOperationCallbackFactory(txnId, getDatasetId(), primaryKeyFields,
componentProvider.getTransactionSubsystemProvider(), Operation.get(op),
- index.resourceType())
- : NoOpOperationCallbackFactory.INSTANCE;
+ index.resourceType()) :
+ NoOpOperationCallbackFactory.INSTANCE;
}
}
@@ -654,7 +651,7 @@
*
* @param metadataProvider,
* the metadata provider.
- * @param jobId,
+ * @param txnId,
* the AsterixDB job id for transaction management.
* @param primaryKeyFieldPermutation,
* the primary key field permutation according to the input.
@@ -663,22 +660,17 @@
* @return the commit runtime factory for inserting/upserting/deleting operations on this dataset.
* @throws AlgebricksException
*/
- public IPushRuntimeFactory getCommitRuntimeFactory(MetadataProvider metadataProvider, JobId jobId,
+ public IPushRuntimeFactory getCommitRuntimeFactory(MetadataProvider metadataProvider, TxnId txnId,
int[] primaryKeyFieldPermutation, boolean isSink) throws AlgebricksException {
int[] datasetPartitions = getDatasetPartitions(metadataProvider);
- return new CommitRuntimeFactory(jobId, datasetId, primaryKeyFieldPermutation,
- metadataProvider.isTemporaryDatasetWriteJob(), metadataProvider.isWriteTransaction(), datasetPartitions,
- isSink);
+ return new CommitRuntimeFactory(txnId, datasetId, primaryKeyFieldPermutation,
+ metadataProvider.isWriteTransaction(), datasetPartitions, isSink);
}
public IFrameOperationCallbackFactory getFrameOpCallbackFactory() {
return NoOpFrameOperationCallbackFactory.INSTANCE;
}
- public boolean isTemp() {
- return getDatasetDetails().isTemp();
- }
-
public boolean isCorrelated() {
return CorrelatedPrefixMergePolicyFactory.NAME.equals(compactionPolicyFactory);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java
index b9b4cd9..ea514e4 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/ExternalDatasetDetails.java
@@ -54,7 +54,6 @@
private static final Logger LOGGER = Logger.getLogger(ExternalDatasetDetails.class.getName());
private final String adapter;
private final Map<String, String> properties;
- private final long addToCacheTime;
private Date lastRefreshTime;
private TransactionState state;
@@ -62,7 +61,6 @@
TransactionState state) {
this.properties = properties;
this.adapter = adapter;
- this.addToCacheTime = System.currentTimeMillis();
this.lastRefreshTime = lastRefreshTime;
this.state = state;
}
@@ -132,16 +130,6 @@
externalRecordBuilder.write(out, true);
}
- @Override
- public boolean isTemp() {
- return false;
- }
-
- @Override
- public long getLastAccessTime() {
- return addToCacheTime;
- }
-
public Date getTimestamp() {
return lastRefreshTime;
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
index 4b64f47..80c4f3d 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/InternalDatasetDetails.java
@@ -61,8 +61,6 @@
private final List<List<String>> primaryKeys;
private final List<IAType> primaryKeyTypes;
private final boolean autogenerated;
- private final boolean temp;
- private long lastAccessTime;
private final List<String> filterField;
private final List<Integer> keySourceIndicators;
@@ -71,7 +69,7 @@
public InternalDatasetDetails(FileStructure fileStructure, PartitioningStrategy partitioningStrategy,
List<List<String>> partitioningKey, List<List<String>> primaryKey, List<Integer> keyFieldIndicators,
- List<IAType> primaryKeyType, boolean autogenerated, List<String> filterField, boolean temp) {
+ List<IAType> primaryKeyType, boolean autogenerated, List<String> filterField) {
this.fileStructure = fileStructure;
this.partitioningStrategy = partitioningStrategy;
this.partitioningKeys = partitioningKey;
@@ -87,8 +85,6 @@
this.primaryKeyTypes = primaryKeyType;
this.autogenerated = autogenerated;
this.filterField = filterField;
- this.temp = temp;
- this.lastAccessTime = System.currentTimeMillis();
}
public List<List<String>> getPartitioningKey() {
@@ -125,21 +121,10 @@
@Override
public DatasetType getDatasetType() {
- lastAccessTime = System.currentTimeMillis();
return DatasetType.INTERNAL;
}
@Override
- public long getLastAccessTime() {
- return lastAccessTime;
- }
-
- @Override
- public boolean isTemp() {
- return temp;
- }
-
- @Override
public void writeDatasetDetailsRecordType(DataOutput out) throws HyracksDataException {
IARecordBuilder internalRecordBuilder = new RecordBuilder();
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java
index 3c409da..6595d97 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/CompactionPolicyTupleTranslator.java
@@ -23,13 +23,13 @@
import java.io.DataInput;
import java.io.DataInputStream;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
import org.apache.asterix.metadata.entities.CompactionPolicy;
import org.apache.asterix.om.base.ARecord;
import org.apache.asterix.om.base.AString;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -82,7 +82,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(CompactionPolicy compactionPolicy)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
tupleBuilder.reset();
aString.setValue(compactionPolicy.getDataverseName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
index 8da34c0..d5e179b 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslator.java
@@ -37,7 +37,6 @@
import org.apache.asterix.builders.UnorderedListBuilder;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.DatasetConfig.TransactionState;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.IDatasetDetails;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
@@ -65,6 +64,7 @@
import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -207,11 +207,8 @@
}
}
- // Temporary dataset only lives in the compiler therefore the temp field is false.
- // DatasetTupleTranslator always read from the metadata node, so the temp flag should be always false.
datasetDetails = new InternalDatasetDetails(fileStructure, partitioningStrategy, partitioningKey,
- partitioningKey, keyFieldSourceIndicator, partitioningKeyType, autogenerated, filterField,
- false);
+ partitioningKey, keyFieldSourceIndicator, partitioningKeyType, autogenerated, filterField);
break;
}
@@ -270,7 +267,8 @@
}
@Override
- public ITupleReference getTupleFromMetadataEntity(Dataset dataset) throws HyracksDataException, MetadataException {
+ public ITupleReference getTupleFromMetadataEntity(Dataset dataset)
+ throws HyracksDataException, AlgebricksException {
OrderedListBuilder listBuilder = new OrderedListBuilder();
ArrayBackedValueStorage itemValue = new ArrayBackedValueStorage();
// write the key in the first 2 fields of the tuple
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java
index 9cd73d7..a58e5d6 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatasourceAdapterTupleTranslator.java
@@ -24,7 +24,6 @@
import java.io.DataInputStream;
import java.util.Calendar;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.external.api.IDataSourceAdapter;
import org.apache.asterix.external.dataset.adapter.AdapterIdentifier;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
@@ -33,6 +32,7 @@
import org.apache.asterix.metadata.entities.DatasourceAdapter;
import org.apache.asterix.om.base.ARecord;
import org.apache.asterix.om.base.AString;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -58,7 +58,7 @@
@Override
public DatasourceAdapter getMetadataEntityFromTuple(ITupleReference tuple)
- throws MetadataException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
byte[] serRecord = tuple.getFieldData(ADAPTER_PAYLOAD_TUPLE_FIELD_INDEX);
int recordStartOffset = tuple.getFieldStart(ADAPTER_PAYLOAD_TUPLE_FIELD_INDEX);
int recordLength = tuple.getFieldLength(ADAPTER_PAYLOAD_TUPLE_FIELD_INDEX);
@@ -86,7 +86,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(DatasourceAdapter adapter)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
// write the key in the first 2 fields of the tuple
tupleBuilder.reset();
aString.setValue(adapter.getAdapterIdentifier().getNamespace());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
index fe0b40d..6d7e25f 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DatatypeTupleTranslator.java
@@ -29,8 +29,7 @@
import org.apache.asterix.builders.IARecordBuilder;
import org.apache.asterix.builders.OrderedListBuilder;
import org.apache.asterix.builders.RecordBuilder;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.MetadataNode;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
@@ -51,6 +50,7 @@
import org.apache.asterix.om.types.AbstractComplexType;
import org.apache.asterix.om.types.IAType;
import org.apache.asterix.om.utils.NonTaggedFormatUtil;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -79,17 +79,17 @@
private ISerializerDeserializer<ARecord> recordSerDes =
SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(MetadataRecordTypes.DATATYPE_RECORDTYPE);
private final MetadataNode metadataNode;
- private final JobId jobId;
+ private final TxnId txnId;
- protected DatatypeTupleTranslator(JobId jobId, MetadataNode metadataNode, boolean getTuple) {
+ protected DatatypeTupleTranslator(TxnId txnId, MetadataNode metadataNode, boolean getTuple) {
super(getTuple, MetadataPrimaryIndexes.DATATYPE_DATASET.getFieldCount());
- this.jobId = jobId;
+ this.txnId = txnId;
this.metadataNode = metadataNode;
}
@Override
public Datatype getMetadataEntityFromTuple(ITupleReference frameTuple)
- throws MetadataException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
byte[] serRecord = frameTuple.getFieldData(DATATYPE_PAYLOAD_TUPLE_FIELD_INDEX);
int recordStartOffset = frameTuple.getFieldStart(DATATYPE_PAYLOAD_TUPLE_FIELD_INDEX);
int recordLength = frameTuple.getFieldLength(DATATYPE_PAYLOAD_TUPLE_FIELD_INDEX);
@@ -99,7 +99,7 @@
return createDataTypeFromARecord(datatypeRecord);
}
- private Datatype createDataTypeFromARecord(ARecord datatypeRecord) throws MetadataException {
+ private Datatype createDataTypeFromARecord(ARecord datatypeRecord) throws AlgebricksException {
String dataverseName =
((AString) datatypeRecord.getValueByPos(MetadataRecordTypes.DATATYPE_ARECORD_DATAVERSENAME_FIELD_INDEX))
.getStringValue();
@@ -142,7 +142,7 @@
boolean isNullable = ((ABoolean) field
.getValueByPos(MetadataRecordTypes.FIELD_ARECORD_ISNULLABLE_FIELD_INDEX)).getBoolean()
.booleanValue();
- fieldTypes[fieldId] = BuiltinTypeMap.getTypeFromTypeName(metadataNode, jobId, dataverseName,
+ fieldTypes[fieldId] = BuiltinTypeMap.getTypeFromTypeName(metadataNode, txnId, dataverseName,
fieldTypeName, isNullable);
fieldId++;
}
@@ -154,7 +154,7 @@
.getValueByPos(MetadataRecordTypes.DERIVEDTYPE_ARECORD_UNORDEREDLIST_FIELD_INDEX))
.getStringValue();
return new Datatype(dataverseName, datatypeName,
- new AUnorderedListType(BuiltinTypeMap.getTypeFromTypeName(metadataNode, jobId,
+ new AUnorderedListType(BuiltinTypeMap.getTypeFromTypeName(metadataNode, txnId,
dataverseName, unorderedlistTypeName, false), datatypeName),
isAnonymous);
}
@@ -163,7 +163,7 @@
.getValueByPos(MetadataRecordTypes.DERIVEDTYPE_ARECORD_ORDEREDLIST_FIELD_INDEX))
.getStringValue();
return new Datatype(dataverseName, datatypeName,
- new AOrderedListType(BuiltinTypeMap.getTypeFromTypeName(metadataNode, jobId, dataverseName,
+ new AOrderedListType(BuiltinTypeMap.getTypeFromTypeName(metadataNode, txnId, dataverseName,
orderedlistTypeName, false), datatypeName),
isAnonymous);
}
@@ -176,7 +176,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(Datatype dataType)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
// write the key in the first two fields of the tuple
tupleBuilder.reset();
aString.setValue(dataType.getDataverseName());
@@ -202,7 +202,7 @@
recordBuilder.addField(MetadataRecordTypes.DATATYPE_ARECORD_DATATYPENAME_FIELD_INDEX, fieldValue);
IAType fieldType = dataType.getDatatype();
- //unwrap nullable type out of the union
+ // unwrap nullable type out of the union
if (fieldType.getTypeTag() == ATypeTag.UNION) {
fieldType = ((AUnionType) dataType.getDatatype()).getActualType();
}
@@ -365,9 +365,10 @@
private String handleNestedDerivedType(String typeName, AbstractComplexType nestedType, Datatype topLevelType,
String dataverseName, String datatypeName) throws HyracksDataException {
try {
- metadataNode.addDatatype(jobId, new Datatype(dataverseName, typeName, nestedType, true));
- } catch (MetadataException e) {
- // The nested record type may have been inserted by a previous DDL statement or by
+ metadataNode.addDatatype(txnId, new Datatype(dataverseName, typeName, nestedType, true));
+ } catch (AlgebricksException e) {
+ // The nested record type may have been inserted by a previous DDL statement or
+ // by
// a previous nested type.
if (!(e.getCause() instanceof HyracksDataException)) {
throw HyracksDataException.create(e);
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
index 4b20a5b..3100b10 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/DataverseTupleTranslator.java
@@ -24,7 +24,6 @@
import java.io.DataInputStream;
import java.util.Calendar;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
@@ -34,6 +33,7 @@
import org.apache.asterix.om.base.ARecord;
import org.apache.asterix.om.base.AString;
import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -77,7 +77,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(Dataverse instance)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
// write the key in the first field of the tuple
tupleBuilder.reset();
aString.setValue(instance.getDataverseName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java
index a29048e..d058d90 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/ExternalFileTupleTranslator.java
@@ -24,7 +24,6 @@
import java.util.Date;
import org.apache.asterix.common.config.DatasetConfig.ExternalFilePendingOp;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.external.indexing.ExternalFile;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
@@ -38,6 +37,7 @@
import org.apache.asterix.om.base.ARecord;
import org.apache.asterix.om.base.AString;
import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -76,7 +76,7 @@
@Override
public ExternalFile getMetadataEntityFromTuple(ITupleReference tuple)
- throws MetadataException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
byte[] serRecord = tuple.getFieldData(EXTERNAL_FILE_PAYLOAD_TUPLE_FIELD_INDEX);
int recordStartOffset = tuple.getFieldStart(EXTERNAL_FILE_PAYLOAD_TUPLE_FIELD_INDEX);
int recordLength = tuple.getFieldLength(EXTERNAL_FILE_PAYLOAD_TUPLE_FIELD_INDEX);
@@ -108,7 +108,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(ExternalFile externalFile)
- throws MetadataException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
// write the key in the first 3 fields of the tuple
tupleBuilder.reset();
// dataverse name
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java
index ac78b8f..269497b 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedConnectionTupleTranslator.java
@@ -27,7 +27,6 @@
import org.apache.asterix.builders.IARecordBuilder;
import org.apache.asterix.builders.UnorderedListBuilder;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
@@ -40,6 +39,7 @@
import org.apache.asterix.om.base.AUnorderedList;
import org.apache.asterix.om.base.IACursor;
import org.apache.asterix.om.types.AUnorderedListType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -62,7 +62,7 @@
@Override
public FeedConnection getMetadataEntityFromTuple(ITupleReference frameTuple)
- throws MetadataException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
byte[] serRecord = frameTuple.getFieldData(FEED_CONN_PAYLOAD_TUPLE_FIELD_INDEX);
int recordStartOffset = frameTuple.getFieldStart(FEED_CONN_PAYLOAD_TUPLE_FIELD_INDEX);
int recordLength = frameTuple.getFieldLength(FEED_CONN_PAYLOAD_TUPLE_FIELD_INDEX);
@@ -106,7 +106,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(FeedConnection me)
- throws MetadataException, HyracksDataException {
+ throws AlgebricksException, HyracksDataException {
tupleBuilder.reset();
// key: dataverse
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java
index ec22735..e80b96f4 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedPolicyTupleTranslator.java
@@ -29,7 +29,6 @@
import org.apache.asterix.builders.IARecordBuilder;
import org.apache.asterix.builders.RecordBuilder;
import org.apache.asterix.builders.UnorderedListBuilder;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
@@ -42,6 +41,7 @@
import org.apache.asterix.om.base.IACursor;
import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -110,7 +110,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(FeedPolicyEntity feedPolicy)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
// write the key in the first three fields of the tuple
ArrayBackedValueStorage itemValue = new ArrayBackedValueStorage();
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java
index 2541e97..264da60 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FeedTupleTranslator.java
@@ -30,7 +30,6 @@
import org.apache.asterix.builders.IARecordBuilder;
import org.apache.asterix.builders.RecordBuilder;
import org.apache.asterix.builders.UnorderedListBuilder;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
@@ -42,6 +41,7 @@
import org.apache.asterix.om.base.IACursor;
import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -109,7 +109,7 @@
}
@Override
- public ITupleReference getTupleFromMetadataEntity(Feed feed) throws HyracksDataException, MetadataException {
+ public ITupleReference getTupleFromMetadataEntity(Feed feed) throws HyracksDataException, AlgebricksException {
// write the key in the first two fields of the tuple
tupleBuilder.reset();
aString.setValue(feed.getDataverseName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
index 858d443..e15805e 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/FunctionTupleTranslator.java
@@ -26,7 +26,6 @@
import java.util.List;
import org.apache.asterix.builders.OrderedListBuilder;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
@@ -36,6 +35,7 @@
import org.apache.asterix.om.base.AString;
import org.apache.asterix.om.base.IACursor;
import org.apache.asterix.om.types.AOrderedListType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -111,7 +111,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(Function function)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
// write the key in the first 2 fields of the tuple
tupleBuilder.reset();
aString.setValue(function.getDataverseName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
index fec4ddc..a154d7f 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslator.java
@@ -29,8 +29,7 @@
import org.apache.asterix.builders.OrderedListBuilder;
import org.apache.asterix.common.config.DatasetConfig.IndexType;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.MetadataNode;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
@@ -95,16 +94,17 @@
private ISerializerDeserializer<ARecord> recordSerde =
SerializerDeserializerProvider.INSTANCE.getSerializerDeserializer(MetadataRecordTypes.INDEX_RECORDTYPE);
private final MetadataNode metadataNode;
- private final JobId jobId;
+ private final TxnId txnId;
- protected IndexTupleTranslator(JobId jobId, MetadataNode metadataNode, boolean getTuple) {
+ protected IndexTupleTranslator(TxnId txnId, MetadataNode metadataNode, boolean getTuple) {
super(getTuple, MetadataPrimaryIndexes.INDEX_DATASET.getFieldCount());
- this.jobId = jobId;
+ this.txnId = txnId;
this.metadataNode = metadataNode;
}
@Override
- public Index getMetadataEntityFromTuple(ITupleReference frameTuple) throws MetadataException, HyracksDataException {
+ public Index getMetadataEntityFromTuple(ITupleReference frameTuple)
+ throws AlgebricksException, HyracksDataException {
byte[] serRecord = frameTuple.getFieldData(INDEX_PAYLOAD_TUPLE_FIELD_INDEX);
int recordStartOffset = frameTuple.getFieldStart(INDEX_PAYLOAD_TUPLE_FIELD_INDEX);
int recordLength = frameTuple.getFieldLength(INDEX_PAYLOAD_TUPLE_FIELD_INDEX);
@@ -141,7 +141,7 @@
List<IAType> searchKeyType = new ArrayList<>(searchKey.size());
while (fieldTypeCursor.next()) {
String typeName = ((AString) fieldTypeCursor.get()).getStringValue();
- IAType fieldType = BuiltinTypeMap.getTypeFromTypeName(metadataNode, jobId, dvName, typeName, false);
+ IAType fieldType = BuiltinTypeMap.getTypeFromTypeName(metadataNode, txnId, dvName, typeName, false);
searchKeyType.add(fieldType);
}
boolean isOverridingKeyTypes = !searchKeyType.isEmpty();
@@ -176,26 +176,23 @@
}
}
- // index key type information is not persisted, thus we extract type information from the record metadata
+ // index key type information is not persisted, thus we extract type information
+ // from the record metadata
if (searchKeyType.isEmpty()) {
try {
- Dataset dSet = metadataNode.getDataset(jobId, dvName, dsName);
+ Dataset dSet = metadataNode.getDataset(txnId, dvName, dsName);
String datatypeName = dSet.getItemTypeName();
String datatypeDataverseName = dSet.getItemTypeDataverseName();
ARecordType recordDt = (ARecordType) metadataNode
- .getDatatype(jobId, datatypeDataverseName, datatypeName).getDatatype();
+ .getDatatype(txnId, datatypeDataverseName, datatypeName).getDatatype();
String metatypeName = dSet.getMetaItemTypeName();
String metatypeDataverseName = dSet.getMetaItemTypeDataverseName();
ARecordType metaDt = null;
if (metatypeName != null && metatypeDataverseName != null) {
- metaDt = (ARecordType) metadataNode.getDatatype(jobId, metatypeDataverseName, metatypeName)
+ metaDt = (ARecordType) metadataNode.getDatatype(txnId, metatypeDataverseName, metatypeName)
.getDatatype();
}
- try {
- searchKeyType = KeyFieldTypeUtil.getKeyTypes(recordDt, metaDt, searchKey, keyFieldSourceIndicator);
- } catch (AlgebricksException e) {
- throw new MetadataException(e);
- }
+ searchKeyType = KeyFieldTypeUtil.getKeyTypes(recordDt, metaDt, searchKey, keyFieldSourceIndicator);
} catch (RemoteException re) {
throw HyracksDataException.create(re);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
index 9c2b824..f001ec4 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/LibraryTupleTranslator.java
@@ -24,13 +24,13 @@
import java.io.DataInputStream;
import java.util.Calendar;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
import org.apache.asterix.metadata.entities.Library;
import org.apache.asterix.om.base.ARecord;
import org.apache.asterix.om.base.AString;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -79,7 +79,8 @@
}
@Override
- public ITupleReference getTupleFromMetadataEntity(Library library) throws HyracksDataException, MetadataException {
+ public ITupleReference getTupleFromMetadataEntity(Library library)
+ throws HyracksDataException, AlgebricksException {
// write the key in the first 2 fields of the tuple
tupleBuilder.reset();
aString.setValue(library.getDataverseName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/MetadataTupleTranslatorProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/MetadataTupleTranslatorProvider.java
index 20f04c4..0625fc4 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/MetadataTupleTranslatorProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/MetadataTupleTranslatorProvider.java
@@ -18,7 +18,7 @@
*/
package org.apache.asterix.metadata.entitytupletranslators;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.MetadataNode;
public class MetadataTupleTranslatorProvider {
@@ -35,9 +35,9 @@
return new DatasourceAdapterTupleTranslator(getTuple);
}
- public DatatypeTupleTranslator getDataTypeTupleTranslator(JobId jobId, MetadataNode metadataNode,
+ public DatatypeTupleTranslator getDataTypeTupleTranslator(TxnId txnId, MetadataNode metadataNode,
boolean getTuple) {
- return new DatatypeTupleTranslator(jobId, metadataNode, getTuple);
+ return new DatatypeTupleTranslator(txnId, metadataNode, getTuple);
}
public DataverseTupleTranslator getDataverseTupleTranslator(boolean getTuple) {
@@ -60,8 +60,8 @@
return new FunctionTupleTranslator(getTuple);
}
- public IndexTupleTranslator getIndexTupleTranslator(JobId jobId, MetadataNode metadataNode, boolean getTuple) {
- return new IndexTupleTranslator(jobId, metadataNode, getTuple);
+ public IndexTupleTranslator getIndexTupleTranslator(TxnId txnId, MetadataNode metadataNode, boolean getTuple) {
+ return new IndexTupleTranslator(txnId, metadataNode, getTuple);
}
public LibraryTupleTranslator getLibraryTupleTranslator(boolean getTuple) {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java
index 5329df4..5733de9 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeGroupTupleTranslator.java
@@ -27,7 +27,6 @@
import java.util.List;
import org.apache.asterix.builders.UnorderedListBuilder;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.metadata.bootstrap.MetadataPrimaryIndexes;
import org.apache.asterix.metadata.bootstrap.MetadataRecordTypes;
@@ -37,6 +36,7 @@
import org.apache.asterix.om.base.AUnorderedList;
import org.apache.asterix.om.base.IACursor;
import org.apache.asterix.om.types.AUnorderedListType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -86,7 +86,7 @@
@Override
public ITupleReference getTupleFromMetadataEntity(NodeGroup instance)
- throws HyracksDataException, MetadataException {
+ throws HyracksDataException, AlgebricksException {
// write the key in the first field of the tuple
tupleBuilder.reset();
aString.setValue(instance.getNodeGroupName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java
index b1847fd..f67ae3b 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entitytupletranslators/NodeTupleTranslator.java
@@ -27,6 +27,7 @@
import org.apache.asterix.om.base.AInt64;
import org.apache.asterix.om.base.AMutableInt64;
import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -84,7 +85,7 @@
}
@Override
- public ITupleReference getTupleFromMetadataEntity(Node instance) throws HyracksDataException, MetadataException {
+ public ITupleReference getTupleFromMetadataEntity(Node instance) throws HyracksDataException, AlgebricksException {
// write the key in the first field of the tuple
tupleBuilder.reset();
aString.setValue(instance.getNodeName());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/BuiltinFeedPolicies.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/BuiltinFeedPolicies.java
index 41b356a..5c67831 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/BuiltinFeedPolicies.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/BuiltinFeedPolicies.java
@@ -29,6 +29,7 @@
import org.apache.asterix.metadata.MetadataTransactionContext;
import org.apache.asterix.metadata.entities.FeedPolicyEntity;
import org.apache.asterix.metadata.utils.MetadataConstants;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
public class BuiltinFeedPolicies {
@@ -61,7 +62,7 @@
return null;
}
- //Basic
+ // Basic
private static FeedPolicyEntity initializeBasicPolicy() {
Map<String, String> policyParams = new HashMap<>();
policyParams.put(FeedPolicyAccessor.ELASTIC, Boolean.toString(false));
@@ -106,7 +107,7 @@
policyParams);
}
- public static void insertInitialFeedPolicies(MetadataTransactionContext mdTxnCtx) throws MetadataException {
+ public static void insertInitialFeedPolicies(MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
for (FeedPolicyEntity feedPolicy : BuiltinFeedPolicies.POLICIES) {
MetadataManager.INSTANCE.addFeedPolicy(mdTxnCtx, feedPolicy);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java
index 3f9c002..c2d31bf 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/feeds/FeedMetadataUtil.java
@@ -54,8 +54,8 @@
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
/**
- * A utility class for providing helper functions for feeds
- * TODO: Refactor this class.
+ * A utility class for providing helper functions for feeds TODO: Refactor this
+ * class.
*/
public class FeedMetadataUtil {
@@ -77,7 +77,7 @@
}
public static Feed validateIfFeedExists(String dataverse, String feedName, MetadataTransactionContext ctx)
- throws CompilationException {
+ throws AlgebricksException {
Feed feed = MetadataManager.INSTANCE.getFeed(ctx, dataverse, feedName);
if (feed == null) {
throw new CompilationException("Unknown source feed: " + feedName);
@@ -86,7 +86,7 @@
}
public static FeedPolicyEntity validateIfPolicyExists(String dataverse, String policyName,
- MetadataTransactionContext ctx) throws CompilationException {
+ MetadataTransactionContext ctx) throws AlgebricksException {
FeedPolicyEntity feedPolicy = MetadataManager.INSTANCE.getFeedPolicy(ctx, dataverse, policyName);
if (feedPolicy == null) {
feedPolicy =
@@ -99,7 +99,7 @@
}
public static void validateFeed(Feed feed, MetadataTransactionContext mdTxnCtx, ICcApplicationContext appCtx)
- throws AsterixException {
+ throws AlgebricksException {
try {
String adapterName = feed.getAdapterName();
Map<String, String> configuration = feed.getAdapterConfiguration();
@@ -273,7 +273,7 @@
}
public static ARecordType getOutputType(IFeed feed, Map<String, String> configuration, String key)
- throws MetadataException {
+ throws AlgebricksException {
ARecordType outputType = null;
String fqOutputType = configuration.get(key);
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java
index c0d9bda..90c0de3 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/functions/ExternalFunctionCompilerUtil.java
@@ -52,7 +52,7 @@
private static Pattern unorderedListPattern = Pattern.compile("[{{*}}]");
public static IFunctionInfo getExternalFunctionInfo(MetadataTransactionContext txnCtx, Function function)
- throws MetadataException {
+ throws AlgebricksException {
String functionKind = function.getKind();
IFunctionInfo finfo = null;
@@ -69,9 +69,9 @@
}
private static IFunctionInfo getScalarFunctionInfo(MetadataTransactionContext txnCtx, Function function)
- throws MetadataException {
- FunctionIdentifier fid = new FunctionIdentifier(function.getDataverseName(), function.getName(),
- function.getArity());
+ throws AlgebricksException {
+ FunctionIdentifier fid =
+ new FunctionIdentifier(function.getDataverseName(), function.getName(), function.getArity());
IResultTypeComputer typeComputer = getResultTypeComputer(txnCtx, function);
List<IAType> arguments = new ArrayList<IAType>();
IAType returnType = null;
@@ -87,7 +87,7 @@
}
private static IAType getTypeInfo(String paramType, MetadataTransactionContext txnCtx, Function function)
- throws MetadataException {
+ throws AlgebricksException {
if (paramType.equalsIgnoreCase(BuiltinType.AINT32.getDisplayName())) {
return (BuiltinType.AINT32);
} else if (paramType.equalsIgnoreCase(BuiltinType.AFLOAT.getDisplayName())) {
@@ -112,7 +112,7 @@
}
private static IAType getCollectionType(String paramType, MetadataTransactionContext txnCtx, Function function)
- throws MetadataException {
+ throws AlgebricksException {
Matcher matcher = orderedListPattern.matcher(paramType);
if (matcher.find()) {
@@ -129,7 +129,7 @@
}
private static IResultTypeComputer getResultTypeComputer(final MetadataTransactionContext txnCtx,
- final Function function) throws MetadataException {
+ final Function function) throws AlgebricksException {
final IAType type = getTypeInfo(function.getReturnType(), txnCtx, function);
switch (type.getTypeTag()) {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/DatasetLock.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/DatasetLock.java
index bc302c2..1988f0a 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/DatasetLock.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/DatasetLock.java
@@ -24,7 +24,7 @@
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.metadata.IMetadataLock;
-import org.apache.asterix.common.utils.InterruptUtil;
+import org.apache.asterix.common.utils.InvokeUtil;
import org.apache.commons.lang3.mutable.MutableInt;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -90,7 +90,7 @@
}
private void incrementModifyCounter() {
- InterruptUtil.doUninterruptibly(() -> {
+ InvokeUtil.doUninterruptibly(() -> {
synchronized (indexBuildCounter) {
while (indexBuildCounter.getValue() > 0) {
indexBuildCounter.wait();
@@ -132,7 +132,7 @@
if (indexBuildCounter.getValue() > 0) {
indexBuildCounter.increment();
} else {
- InterruptUtil.doUninterruptibly(() -> {
+ InvokeUtil.doUninterruptibly(() -> {
while (true) {
synchronized (dsModifyCounter) {
if (dsModifyCounter.getValue() == 0) {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/MetadataLockManager.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/MetadataLockManager.java
index 779fe2a..61bcbc7 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/MetadataLockManager.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/lock/MetadataLockManager.java
@@ -22,7 +22,6 @@
import java.util.function.Function;
import org.apache.asterix.common.api.IMetadataLockManager;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.metadata.IMetadataLock;
import org.apache.asterix.common.metadata.LockList;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -49,147 +48,149 @@
}
@Override
- public void acquireDataverseReadLock(LockList locks, String dataverseName) throws AsterixException {
+ public void acquireDataverseReadLock(LockList locks, String dataverseName) throws AlgebricksException {
String key = DATAVERSE_PREFIX + dataverseName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireDataverseWriteLock(LockList locks, String dataverseName) throws AsterixException {
+ public void acquireDataverseWriteLock(LockList locks, String dataverseName) throws AlgebricksException {
String key = DATAVERSE_PREFIX + dataverseName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireDatasetReadLock(LockList locks, String datasetName) throws AsterixException {
+ public void acquireDatasetReadLock(LockList locks, String datasetName) throws AlgebricksException {
String key = DATASET_PREFIX + datasetName;
DatasetLock lock = (DatasetLock) mdlocks.computeIfAbsent(key, DATASET_LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireDatasetWriteLock(LockList locks, String datasetName) throws AsterixException {
+ public void acquireDatasetWriteLock(LockList locks, String datasetName) throws AlgebricksException {
String key = DATASET_PREFIX + datasetName;
DatasetLock lock = (DatasetLock) mdlocks.computeIfAbsent(key, DATASET_LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireDatasetModifyLock(LockList locks, String datasetName) throws AsterixException {
+ public void acquireDatasetModifyLock(LockList locks, String datasetName) throws AlgebricksException {
String key = DATASET_PREFIX + datasetName;
DatasetLock lock = (DatasetLock) mdlocks.computeIfAbsent(key, DATASET_LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.MODIFY, lock);
}
@Override
- public void acquireDatasetCreateIndexLock(LockList locks, String datasetName) throws AsterixException {
+ public void acquireDatasetCreateIndexLock(LockList locks, String datasetName) throws AlgebricksException {
String dsKey = DATASET_PREFIX + datasetName;
DatasetLock lock = (DatasetLock) mdlocks.computeIfAbsent(dsKey, DATASET_LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.INDEX_BUILD, lock);
}
@Override
- public void acquireDatasetExclusiveModificationLock(LockList locks, String datasetName) throws AsterixException {
+ public void acquireDatasetExclusiveModificationLock(LockList locks, String datasetName) throws AlgebricksException {
String key = DATASET_PREFIX + datasetName;
DatasetLock lock = (DatasetLock) mdlocks.computeIfAbsent(key, DATASET_LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.EXCLUSIVE_MODIFY, lock);
}
@Override
- public void acquireFunctionReadLock(LockList locks, String functionName) throws AsterixException {
+ public void acquireFunctionReadLock(LockList locks, String functionName) throws AlgebricksException {
String key = FUNCTION_PREFIX + functionName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireFunctionWriteLock(LockList locks, String functionName) throws AsterixException {
+ public void acquireFunctionWriteLock(LockList locks, String functionName) throws AlgebricksException {
String key = FUNCTION_PREFIX + functionName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireNodeGroupReadLock(LockList locks, String nodeGroupName) throws AsterixException {
+ public void acquireNodeGroupReadLock(LockList locks, String nodeGroupName) throws AlgebricksException {
String key = NODE_GROUP_PREFIX + nodeGroupName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireNodeGroupWriteLock(LockList locks, String nodeGroupName) throws AsterixException {
+ public void acquireNodeGroupWriteLock(LockList locks, String nodeGroupName) throws AlgebricksException {
String key = NODE_GROUP_PREFIX + nodeGroupName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireActiveEntityReadLock(LockList locks, String entityName) throws AsterixException {
+ public void acquireActiveEntityReadLock(LockList locks, String entityName) throws AlgebricksException {
String key = ACTIVE_PREFIX + entityName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireActiveEntityWriteLock(LockList locks, String entityName) throws AsterixException {
+ public void acquireActiveEntityWriteLock(LockList locks, String entityName) throws AlgebricksException {
String key = ACTIVE_PREFIX + entityName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireFeedPolicyWriteLock(LockList locks, String feedPolicyName) throws AsterixException {
+ public void acquireFeedPolicyWriteLock(LockList locks, String feedPolicyName) throws AlgebricksException {
String key = FEED_POLICY_PREFIX + feedPolicyName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireFeedPolicyReadLock(LockList locks, String feedPolicyName) throws AsterixException {
+ public void acquireFeedPolicyReadLock(LockList locks, String feedPolicyName) throws AlgebricksException {
String key = FEED_POLICY_PREFIX + feedPolicyName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireMergePolicyReadLock(LockList locks, String mergePolicyName) throws AsterixException {
+ public void acquireMergePolicyReadLock(LockList locks, String mergePolicyName) throws AlgebricksException {
String key = MERGE_POLICY_PREFIX + mergePolicyName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireMergePolicyWriteLock(LockList locks, String mergePolicyName) throws AsterixException {
+ public void acquireMergePolicyWriteLock(LockList locks, String mergePolicyName) throws AlgebricksException {
String key = MERGE_POLICY_PREFIX + mergePolicyName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireDataTypeReadLock(LockList locks, String datatypeName) throws AsterixException {
+ public void acquireDataTypeReadLock(LockList locks, String datatypeName) throws AlgebricksException {
String key = DATATYPE_PREFIX + datatypeName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireDataTypeWriteLock(LockList locks, String datatypeName) throws AsterixException {
+ public void acquireDataTypeWriteLock(LockList locks, String datatypeName) throws AlgebricksException {
String key = DATATYPE_PREFIX + datatypeName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
}
@Override
- public void acquireExtensionReadLock(LockList locks, String extension, String entityName) throws AsterixException {
+ public void acquireExtensionReadLock(LockList locks, String extension, String entityName)
+ throws AlgebricksException {
String key = EXTENSION_PREFIX + extension + entityName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.READ, lock);
}
@Override
- public void acquireExtensionWriteLock(LockList locks, String extension, String entityName) throws AsterixException {
+ public void acquireExtensionWriteLock(LockList locks, String extension, String entityName)
+ throws AlgebricksException {
String key = EXTENSION_PREFIX + extension + entityName;
IMetadataLock lock = mdlocks.computeIfAbsent(key, LOCK_FUNCTION);
locks.add(IMetadataLock.Mode.WRITE, lock);
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
index 53c3dc0..5973c06 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/DatasetUtil.java
@@ -37,9 +37,8 @@
import org.apache.asterix.common.dataflow.ICcApplicationContext;
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.transactions.IRecoveryManager;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.IndexingConstants;
import org.apache.asterix.formats.base.IDataFormat;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
@@ -89,7 +88,6 @@
import org.apache.hyracks.storage.am.common.dataflow.IndexCreateOperatorDescriptor;
import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
import org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
import org.apache.hyracks.storage.am.lsm.common.dataflow.LSMTreeIndexCompactOperatorDescriptor;
@@ -206,7 +204,6 @@
return new Pair<>(mergePolicyFactory, properties);
}
- @SuppressWarnings("unchecked")
public static void writePropertyTypeRecord(String name, String value, DataOutput out, ARecordType recordType)
throws HyracksDataException {
IARecordBuilder propertyRecordBuilder = new RecordBuilder();
@@ -293,12 +290,13 @@
LOGGER.info("CREATING File Splits: " + sb.toString());
Pair<ILSMMergePolicyFactory, Map<String, String>> compactionInfo =
DatasetUtil.getMergePolicyFactory(dataset, metadataProvider.getMetadataTxnContext());
- //prepare a LocalResourceMetadata which will be stored in NC's local resource repository
+ // prepare a LocalResourceMetadata which will be stored in NC's local resource
+ // repository
IResourceFactory resourceFactory = dataset.getResourceFactory(metadataProvider, index, itemType, metaItemType,
compactionInfo.first, compactionInfo.second);
IndexBuilderFactory indexBuilderFactory =
new IndexBuilderFactory(metadataProvider.getStorageComponentProvider().getStorageManager(),
- splitsAndConstraint.first, resourceFactory, !dataset.isTemp());
+ splitsAndConstraint.first, resourceFactory, true);
IndexCreateOperatorDescriptor indexCreateOp = new IndexCreateOperatorDescriptor(spec, indexBuilderFactory);
AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, indexCreateOp,
splitsAndConstraint.second);
@@ -337,13 +335,13 @@
* the metadata provider.
* @param dataset,
* the dataset to scan.
- * @param jobId,
+ * @param txnId,
* the AsterixDB job id for transaction management.
* @return a primary index scan operator.
* @throws AlgebricksException
*/
public static IOperatorDescriptor createPrimaryIndexScanOp(JobSpecification spec, MetadataProvider metadataProvider,
- Dataset dataset, JobId jobId) throws AlgebricksException {
+ Dataset dataset, TxnId txnId) throws AlgebricksException {
Pair<IFileSplitProvider, AlgebricksPartitionConstraint> primarySplitsAndConstraint =
metadataProvider.getSplitProviderAndConstraints(dataset);
IFileSplitProvider primaryFileSplitProvider = primarySplitsAndConstraint.first;
@@ -353,9 +351,8 @@
// +Infinity
int[] highKeyFields = null;
ITransactionSubsystemProvider txnSubsystemProvider = TransactionSubsystemProvider.INSTANCE;
- boolean temp = dataset.getDatasetDetails().isTemp();
- ISearchOperationCallbackFactory searchCallbackFactory = temp ? NoOpOperationCallbackFactory.INSTANCE
- : new PrimaryIndexInstantSearchOperationCallbackFactory(jobId, dataset.getDatasetId(),
+ ISearchOperationCallbackFactory searchCallbackFactory =
+ new PrimaryIndexInstantSearchOperationCallbackFactory(txnId, dataset.getDatasetId(),
dataset.getPrimaryBloomFilterFields(), txnSubsystemProvider,
IRecoveryManager.ResourceType.LSM_BTREE);
IndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(
@@ -393,74 +390,69 @@
int numFilterFields = DatasetUtil.getFilterField(dataset) == null ? 0 : 1;
ARecordType itemType = (ARecordType) metadataProvider.findType(dataset);
ARecordType metaItemType = (ARecordType) metadataProvider.findMetaType(dataset);
- try {
- Index primaryIndex = metadataProvider.getIndex(dataset.getDataverseName(), dataset.getDatasetName(),
- dataset.getDatasetName());
- Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
- metadataProvider.getSplitProviderAndConstraints(dataset);
+ Index primaryIndex = metadataProvider.getIndex(dataset.getDataverseName(), dataset.getDatasetName(),
+ dataset.getDatasetName());
+ Pair<IFileSplitProvider, AlgebricksPartitionConstraint> splitsAndConstraint =
+ metadataProvider.getSplitProviderAndConstraints(dataset);
- // prepare callback
- JobId jobId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getJobId();
- int[] primaryKeyFields = new int[numKeys];
- for (int i = 0; i < numKeys; i++) {
- primaryKeyFields[i] = i;
- }
- boolean hasSecondaries =
- metadataProvider.getDatasetIndexes(dataset.getDataverseName(), dataset.getDatasetName()).size() > 1;
- IStorageComponentProvider storageComponentProvider = metadataProvider.getStorageComponentProvider();
- IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
- storageComponentProvider, primaryIndex, jobId, IndexOperation.UPSERT, primaryKeyFields);
- ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory(
- storageComponentProvider, primaryIndex, jobId, IndexOperation.UPSERT, primaryKeyFields);
- IIndexDataflowHelperFactory idfh = new IndexDataflowHelperFactory(
- storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
- LSMPrimaryUpsertOperatorDescriptor op;
- ITypeTraits[] outputTypeTraits = new ITypeTraits[inputRecordDesc.getFieldCount()
- + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields];
- ISerializerDeserializer<?>[] outputSerDes = new ISerializerDeserializer[inputRecordDesc.getFieldCount()
- + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields];
- IDataFormat dataFormat = metadataProvider.getDataFormat();
-
- // add the previous record first
- int f = 0;
- outputSerDes[f] = dataFormat.getSerdeProvider().getSerializerDeserializer(itemType);
- f++;
- // add the previous meta second
- if (dataset.hasMetaPart()) {
- outputSerDes[f] = dataFormat.getSerdeProvider().getSerializerDeserializer(metaItemType);
- outputTypeTraits[f] = dataFormat.getTypeTraitProvider().getTypeTrait(metaItemType);
- f++;
- }
- // add the previous filter third
- int fieldIdx = -1;
- if (numFilterFields > 0) {
- String filterField = DatasetUtil.getFilterField(dataset).get(0);
- String[] fieldNames = itemType.getFieldNames();
- int i = 0;
- for (; i < fieldNames.length; i++) {
- if (fieldNames[i].equals(filterField)) {
- break;
- }
- }
- fieldIdx = i;
- outputTypeTraits[f] =
- dataFormat.getTypeTraitProvider().getTypeTrait(itemType.getFieldTypes()[fieldIdx]);
- outputSerDes[f] =
- dataFormat.getSerdeProvider().getSerializerDeserializer(itemType.getFieldTypes()[fieldIdx]);
- f++;
- }
- for (int j = 0; j < inputRecordDesc.getFieldCount(); j++) {
- outputTypeTraits[j + f] = inputRecordDesc.getTypeTraits()[j];
- outputSerDes[j + f] = inputRecordDesc.getFields()[j];
- }
- RecordDescriptor outputRecordDesc = new RecordDescriptor(outputSerDes, outputTypeTraits);
- op = new LSMPrimaryUpsertOperatorDescriptor(spec, outputRecordDesc, fieldPermutation, idfh,
- missingWriterFactory, modificationCallbackFactory, searchCallbackFactory,
- dataset.getFrameOpCallbackFactory(), numKeys, itemType, fieldIdx, hasSecondaries);
- return new Pair<>(op, splitsAndConstraint.second);
- } catch (MetadataException me) {
- throw new AlgebricksException(me);
+ // prepare callback
+ TxnId txnId = ((JobEventListenerFactory) spec.getJobletEventListenerFactory()).getTxnId(null);
+ int[] primaryKeyFields = new int[numKeys];
+ for (int i = 0; i < numKeys; i++) {
+ primaryKeyFields[i] = i;
}
+ boolean hasSecondaries =
+ metadataProvider.getDatasetIndexes(dataset.getDataverseName(), dataset.getDatasetName()).size() > 1;
+ IStorageComponentProvider storageComponentProvider = metadataProvider.getStorageComponentProvider();
+ IModificationOperationCallbackFactory modificationCallbackFactory = dataset.getModificationCallbackFactory(
+ storageComponentProvider, primaryIndex, txnId, IndexOperation.UPSERT, primaryKeyFields);
+ ISearchOperationCallbackFactory searchCallbackFactory = dataset.getSearchCallbackFactory(
+ storageComponentProvider, primaryIndex, txnId, IndexOperation.UPSERT, primaryKeyFields);
+ IIndexDataflowHelperFactory idfh =
+ new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), splitsAndConstraint.first);
+ LSMPrimaryUpsertOperatorDescriptor op;
+ ITypeTraits[] outputTypeTraits =
+ new ITypeTraits[inputRecordDesc.getFieldCount() + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields];
+ ISerializerDeserializer<?>[] outputSerDes = new ISerializerDeserializer[inputRecordDesc.getFieldCount()
+ + (dataset.hasMetaPart() ? 2 : 1) + numFilterFields];
+ IDataFormat dataFormat = metadataProvider.getDataFormat();
+
+ // add the previous record first
+ int f = 0;
+ outputSerDes[f] = dataFormat.getSerdeProvider().getSerializerDeserializer(itemType);
+ f++;
+ // add the previous meta second
+ if (dataset.hasMetaPart()) {
+ outputSerDes[f] = dataFormat.getSerdeProvider().getSerializerDeserializer(metaItemType);
+ outputTypeTraits[f] = dataFormat.getTypeTraitProvider().getTypeTrait(metaItemType);
+ f++;
+ }
+ // add the previous filter third
+ int fieldIdx = -1;
+ if (numFilterFields > 0) {
+ String filterField = DatasetUtil.getFilterField(dataset).get(0);
+ String[] fieldNames = itemType.getFieldNames();
+ int i = 0;
+ for (; i < fieldNames.length; i++) {
+ if (fieldNames[i].equals(filterField)) {
+ break;
+ }
+ }
+ fieldIdx = i;
+ outputTypeTraits[f] = dataFormat.getTypeTraitProvider().getTypeTrait(itemType.getFieldTypes()[fieldIdx]);
+ outputSerDes[f] =
+ dataFormat.getSerdeProvider().getSerializerDeserializer(itemType.getFieldTypes()[fieldIdx]);
+ f++;
+ }
+ for (int j = 0; j < inputRecordDesc.getFieldCount(); j++) {
+ outputTypeTraits[j + f] = inputRecordDesc.getTypeTraits()[j];
+ outputSerDes[j + f] = inputRecordDesc.getFields()[j];
+ }
+ RecordDescriptor outputRecordDesc = new RecordDescriptor(outputSerDes, outputTypeTraits);
+ op = new LSMPrimaryUpsertOperatorDescriptor(spec, outputRecordDesc, fieldPermutation, idfh,
+ missingWriterFactory, modificationCallbackFactory, searchCallbackFactory,
+ dataset.getFrameOpCallbackFactory(), numKeys, itemType, fieldIdx, hasSecondaries);
+ return new Pair<>(op, splitsAndConstraint.second);
}
/**
@@ -503,7 +495,7 @@
}
public static boolean isFullyQualifiedName(String datasetName) {
- return datasetName.indexOf('.') > 0; //NOSONAR a fully qualified name can't start with a .
+ return datasetName.indexOf('.') > 0; // NOSONAR a fully qualified name can't start with a .
}
public static String getFullyQualifiedName(Dataset dataset) {
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java
index 5bb0aa9..d625dd0 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/ExternalIndexingOperations.java
@@ -202,7 +202,7 @@
IResourceFactory resourceFactory = dataset.getResourceFactory(metadataProvider, fileIndex, recordType, null,
mergePolicyFactory, mergePolicyProperties);
IIndexBuilderFactory indexBuilderFactory = new IndexBuilderFactory(storageComponentProvider.getStorageManager(),
- secondaryFileSplitProvider, resourceFactory, !dataset.isTemp());
+ secondaryFileSplitProvider, resourceFactory, true);
IIndexDataflowHelperFactory dataflowHelperFactory =
new IndexDataflowHelperFactory(storageComponentProvider.getStorageManager(), secondaryFileSplitProvider);
ExternalFilesIndexCreateOperatorDescriptor externalFilesOp = new ExternalFilesIndexCreateOperatorDescriptor(
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
index cc6923e..e6a24e3 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/IndexUtil.java
@@ -28,20 +28,19 @@
import org.apache.asterix.common.config.OptimizationConfUtil;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.ExternalFile;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
import org.apache.asterix.metadata.entities.InternalDatasetDetails;
import org.apache.asterix.runtime.job.listener.JobEventListenerFactory;
-import org.apache.asterix.transaction.management.service.transaction.JobIdFactory;
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.core.rewriter.base.PhysicalOptimizationConfig;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.api.job.JobSpecification;
-import org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor;
public class IndexUtil {
@@ -162,13 +161,13 @@
* the metadata provider.
* @return the AsterixDB job id for transaction management.
*/
- public static JobId bindJobEventListener(JobSpecification spec, MetadataProvider metadataProvider) {
- JobId jobId = JobIdFactory.generateJobId();
- metadataProvider.setJobId(jobId);
+ public static TxnId bindJobEventListener(JobSpecification spec, MetadataProvider metadataProvider) {
+ TxnId txnId = TxnIdFactory.create();
+ metadataProvider.setTxnId(txnId);
boolean isWriteTransaction = metadataProvider.isWriteTransaction();
- IJobletEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(jobId, isWriteTransaction);
+ IJobletEventListenerFactory jobEventListenerFactory = new JobEventListenerFactory(txnId, isWriteTransaction);
spec.setJobletEventListenerFactory(jobEventListenerFactory);
- return jobId;
+ return txnId;
}
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/InvertedIndexResourceFactoryProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/InvertedIndexResourceFactoryProvider.java
index 362305e..43cc0ec 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/InvertedIndexResourceFactoryProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/InvertedIndexResourceFactoryProvider.java
@@ -110,7 +110,6 @@
AsterixVirtualBufferCacheProvider vbcProvider = new AsterixVirtualBufferCacheProvider(dataset.getDatasetId());
ILSMIOOperationSchedulerProvider ioSchedulerProvider =
storageComponentProvider.getIoOperationSchedulerProvider();
- boolean durable = !dataset.isTemp();
double bloomFilterFalsePositiveRate = mdProvider.getStorageProperties().getBloomFilterFalsePositiveRate();
ITypeTraits[] typeTraits = getInvListTypeTraits(mdProvider, dataset, recordType, metaType);
IBinaryComparatorFactory[] cmpFactories =
@@ -122,7 +121,7 @@
return new LSMInvertedIndexLocalResourceFactory(storageManager, typeTraits, cmpFactories, filterTypeTraits,
filterCmpFactories, secondaryFilterFields, opTrackerFactory, ioOpCallbackFactory,
metadataPageManagerFactory, vbcProvider, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties,
- durable, tokenTypeTraits, tokenCmpFactories, tokenizerFactory, isPartitioned, invertedIndexFields,
+ true, tokenTypeTraits, tokenCmpFactories, tokenizerFactory, isPartitioned, invertedIndexFields,
secondaryFilterFieldsForNonBulkLoadOps, invertedIndexFieldsForNonBulkLoadOps,
bloomFilterFalsePositiveRate);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java
index 4cf25f7..baac712 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/MetadataLockUtil.java
@@ -19,8 +19,8 @@
package org.apache.asterix.metadata.utils;
import org.apache.asterix.common.api.IMetadataLockManager;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.metadata.LockList;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
public class MetadataLockUtil {
@@ -30,7 +30,7 @@
public static void createDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
String itemTypeDataverseName, String itemTypeFullyQualifiedName, String metaItemTypeDataverseName,
String metaItemTypeFullyQualifiedName, String nodeGroupName, String compactionPolicyName,
- String datasetFullyQualifiedName, boolean isDefaultCompactionPolicy) throws AsterixException {
+ String datasetFullyQualifiedName, boolean isDefaultCompactionPolicy) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
if (!dataverseName.equals(itemTypeDataverseName)) {
lockMgr.acquireDataverseReadLock(locks, itemTypeDataverseName);
@@ -54,113 +54,113 @@
}
public static void createIndexBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDatasetCreateIndexLock(locks, datasetFullyQualifiedName);
}
public static void dropIndexBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDatasetWriteLock(locks, datasetFullyQualifiedName);
}
public static void createTypeBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String itemTypeFullyQualifiedName) throws AsterixException {
+ String itemTypeFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDataTypeWriteLock(locks, itemTypeFullyQualifiedName);
}
public static void dropDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDatasetWriteLock(locks, datasetFullyQualifiedName);
}
public static void dropTypeBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String dataTypeFullyQualifiedName) throws AsterixException {
+ String dataTypeFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDataTypeWriteLock(locks, dataTypeFullyQualifiedName);
}
public static void functionStatementBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String functionFullyQualifiedName) throws AsterixException {
+ String functionFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireFunctionWriteLock(locks, functionFullyQualifiedName);
}
public static void modifyDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDatasetModifyLock(locks, datasetFullyQualifiedName);
}
public static void insertDeleteUpsertBegin(IMetadataLockManager lockMgr, LockList locks,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks,
MetadataUtil.getDataverseFromFullyQualifiedName(datasetFullyQualifiedName));
lockMgr.acquireDatasetModifyLock(locks, datasetFullyQualifiedName);
}
public static void dropFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String feedFullyQualifiedName) throws AsterixException {
+ String feedFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireActiveEntityWriteLock(locks, feedFullyQualifiedName);
}
public static void dropFeedPolicyBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String policyName) throws AsterixException {
+ String policyName) throws AlgebricksException {
lockMgr.acquireActiveEntityWriteLock(locks, policyName);
lockMgr.acquireDataverseReadLock(locks, dataverseName);
}
public static void startFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String feedName) throws AsterixException {
+ String feedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireActiveEntityReadLock(locks, feedName);
}
public static void stopFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String feedName) throws AsterixException {
+ String feedName) throws AlgebricksException {
// TODO: dataset lock?
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireActiveEntityReadLock(locks, feedName);
}
public static void createFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String feedFullyQualifiedName) throws AsterixException {
+ String feedFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireActiveEntityWriteLock(locks, feedFullyQualifiedName);
}
public static void connectFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireActiveEntityReadLock(locks, feedFullyQualifiedName);
lockMgr.acquireDatasetReadLock(locks, datasetFullyQualifiedName);
}
public static void createFeedPolicyBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String policyName) throws AsterixException {
+ String policyName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireFeedPolicyWriteLock(locks, policyName);
}
public static void disconnectFeedBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName, String feedFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireActiveEntityReadLock(locks, feedFullyQualifiedName);
lockMgr.acquireDatasetReadLock(locks, datasetFullyQualifiedName);
}
public static void compactBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDatasetReadLock(locks, datasetFullyQualifiedName);
}
public static void refreshDatasetBegin(IMetadataLockManager lockMgr, LockList locks, String dataverseName,
- String datasetFullyQualifiedName) throws AsterixException {
+ String datasetFullyQualifiedName) throws AlgebricksException {
lockMgr.acquireDataverseReadLock(locks, dataverseName);
lockMgr.acquireDatasetExclusiveModificationLock(locks, datasetFullyQualifiedName);
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java
index 425f8a1d..5075adc 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/RTreeResourceFactoryProvider.java
@@ -142,7 +142,6 @@
storageComponentProvider.getMetadataPageManagerFactory();
ILSMIOOperationSchedulerProvider ioSchedulerProvider =
storageComponentProvider.getIoOperationSchedulerProvider();
- boolean durable = !dataset.isTemp();
ILinearizeComparatorFactory linearizeCmpFactory =
MetadataProvider.proposeLinearizer(keyType, secondaryComparatorFactories.length);
ITypeTraits[] typeTraits = getTypeTraits(mdProvider, dataset, index, recordType, metaType);
@@ -159,12 +158,12 @@
return new LSMRTreeWithAntiMatterLocalResourceFactory(storageManager, typeTraits, rtreeCmpFactories,
filterTypeTraits, filterCmpFactories, secondaryFilterFields, opTrackerFactory, ioOpCallbackFactory,
metadataPageManagerFactory, vbcProvider, ioSchedulerProvider, mergePolicyFactory,
- mergePolicyProperties, durable, valueProviderFactories, rTreePolicyType, linearizeCmpFactory,
+ mergePolicyProperties, true, valueProviderFactories, rTreePolicyType, linearizeCmpFactory,
rtreeFields, isPointMBR, btreeCompFactories);
} else {
return new ExternalRTreeLocalResourceFactory(storageManager, typeTraits, rtreeCmpFactories,
filterTypeTraits, filterCmpFactories, secondaryFilterFields, opTrackerFactory, ioOpCallbackFactory,
- metadataPageManagerFactory, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties, durable,
+ metadataPageManagerFactory, ioSchedulerProvider, mergePolicyFactory, mergePolicyProperties, true,
btreeCompFactories, valueProviderFactories, rTreePolicyType, linearizeCmpFactory, rtreeFields,
new int[] { numNestedSecondaryKeyFields }, isPointMBR,
mdProvider.getStorageProperties().getBloomFilterFalsePositiveRate());
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
index 78d9c19..8f70f21 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryBTreeOperationsHelper.java
@@ -22,7 +22,7 @@
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.GlobalConfig;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.IndexingConstants;
import org.apache.asterix.external.operators.ExternalScanOperatorDescriptor;
import org.apache.asterix.metadata.declared.MetadataProvider;
@@ -129,11 +129,11 @@
// Create dummy key provider for feeding the primary index scan.
IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset,
metadataProvider);
- JobId jobId = IndexUtil.bindJobEventListener(spec, metadataProvider);
+ TxnId txnId = IndexUtil.bindJobEventListener(spec, metadataProvider);
// Create primary index scan op.
IOperatorDescriptor primaryScanOp = DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, dataset,
- jobId);
+ txnId);
// Assign op.
IOperatorDescriptor sourceOp = primaryScanOp;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedBTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedBTreeOperationsHelper.java
index 8ef5f34..89bd4b1 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedBTreeOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedBTreeOperationsHelper.java
@@ -21,7 +21,7 @@
import java.util.List;
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
@@ -72,14 +72,14 @@
// only handle internal datasets
// Create dummy key provider for feeding the primary index scan.
- JobId jobId = IndexUtil.bindJobEventListener(spec, metadataProvider);
+ TxnId txnId = IndexUtil.bindJobEventListener(spec, metadataProvider);
// Create dummy key provider for feeding the primary index scan.
IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset, metadataProvider);
// Create primary index scan op.
IOperatorDescriptor primaryScanOp = createPrimaryIndexScanDiskComponentsOp(spec, metadataProvider,
- getTaggedRecordDescriptor(dataset.getPrimaryRecordDescriptor(metadataProvider)), jobId);
+ getTaggedRecordDescriptor(dataset.getPrimaryRecordDescriptor(metadataProvider)), txnId);
// Assign op.
IOperatorDescriptor sourceOp = primaryScanOp;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedInvertedIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedInvertedIndexOperationsHelper.java
index 262b259..93cc11d 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedInvertedIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedInvertedIndexOperationsHelper.java
@@ -21,7 +21,7 @@
import org.apache.asterix.common.config.DatasetConfig.IndexType;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -206,14 +206,14 @@
@Override
public JobSpecification buildLoadingJobSpec() throws AlgebricksException {
JobSpecification spec = RuntimeUtils.createJobSpecification(metadataProvider.getApplicationContext());
- JobId jobId = IndexUtil.bindJobEventListener(spec, metadataProvider);
+ TxnId txnId = IndexUtil.bindJobEventListener(spec, metadataProvider);
// Create dummy key provider for feeding the primary index scan.
IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset, metadataProvider);
// Create primary index scan op.
IOperatorDescriptor primaryScanOp = createPrimaryIndexScanDiskComponentsOp(spec, metadataProvider,
- getTaggedRecordDescriptor(dataset.getPrimaryRecordDescriptor(metadataProvider)), jobId);
+ getTaggedRecordDescriptor(dataset.getPrimaryRecordDescriptor(metadataProvider)), txnId);
IOperatorDescriptor sourceOp = primaryScanOp;
boolean isOverridingKeyFieldTypes = index.isOverridingKeyFieldTypes();
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java
index b663b42..1333493 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedRTreeOperationsHelper.java
@@ -23,7 +23,7 @@
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.ErrorCode;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.formats.nontagged.TypeTraitProvider;
@@ -155,7 +155,7 @@
}
@Override
- public JobSpecification buildLoadingJobSpec() throws AsterixException, AlgebricksException {
+ public JobSpecification buildLoadingJobSpec() throws AlgebricksException {
/***************************************************
* [ About PointMBR Optimization ]
* Instead of storing a MBR(4 doubles) for a point(2 doubles) in RTree leaf node,
@@ -184,11 +184,11 @@
// Create dummy key provider for feeding the primary index scan.
IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset, metadataProvider);
- JobId jobId = IndexUtil.bindJobEventListener(spec, metadataProvider);
+ TxnId txnId = IndexUtil.bindJobEventListener(spec, metadataProvider);
// Create primary index scan op.
IOperatorDescriptor primaryScanOp = createPrimaryIndexScanDiskComponentsOp(spec, metadataProvider,
- getTaggedRecordDescriptor(dataset.getPrimaryRecordDescriptor(metadataProvider)), jobId);
+ getTaggedRecordDescriptor(dataset.getPrimaryRecordDescriptor(metadataProvider)), txnId);
// Assign op.
IOperatorDescriptor sourceOp = primaryScanOp;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java
index b99ae2f..2a4a952 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryCorrelatedTreeIndexOperationsHelper.java
@@ -24,14 +24,12 @@
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.common.transactions.IRecoveryManager;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory;
import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
import org.apache.asterix.metadata.entities.Index;
-import org.apache.asterix.om.functions.BuiltinFunctions;
-import org.apache.asterix.om.functions.IFunctionDescriptor;
import org.apache.asterix.runtime.operators.LSMSecondaryIndexBulkLoadOperatorDescriptor;
import org.apache.asterix.runtime.operators.LSMSecondaryIndexCreationTupleProcessorOperatorDescriptor;
import org.apache.asterix.transaction.management.opcallbacks.PrimaryIndexInstantSearchOperationCallbackFactory;
@@ -58,7 +56,6 @@
import org.apache.hyracks.dataflow.std.sort.ExternalSortOperatorDescriptor;
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.btree.dataflow.LSMBTreeDiskComponentScanOperatorDescriptor;
/**
@@ -276,11 +273,10 @@
}
protected IOperatorDescriptor createPrimaryIndexScanDiskComponentsOp(JobSpecification spec,
- MetadataProvider metadataProvider, RecordDescriptor outRecDesc, JobId jobId) throws AlgebricksException {
+ MetadataProvider metadataProvider, RecordDescriptor outRecDesc, TxnId txnId) throws AlgebricksException {
ITransactionSubsystemProvider txnSubsystemProvider = TransactionSubsystemProvider.INSTANCE;
- boolean temp = dataset.getDatasetDetails().isTemp();
- ISearchOperationCallbackFactory searchCallbackFactory = temp ? NoOpOperationCallbackFactory.INSTANCE
- : new PrimaryIndexInstantSearchOperationCallbackFactory(jobId, dataset.getDatasetId(),
+ ISearchOperationCallbackFactory searchCallbackFactory =
+ new PrimaryIndexInstantSearchOperationCallbackFactory(txnId, dataset.getDatasetId(),
dataset.getPrimaryBloomFilterFields(), txnSubsystemProvider,
IRecoveryManager.ResourceType.LSM_BTREE);
IndexDataflowHelperFactory indexHelperFactory = new IndexDataflowHelperFactory(
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
index 5dac407..7701f65 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryIndexOperationsHelper.java
@@ -19,8 +19,6 @@
package org.apache.asterix.metadata.utils;
-import static org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor.DropOption;
-
import java.util.Collections;
import java.util.List;
import java.util.Map;
@@ -51,6 +49,8 @@
import org.apache.asterix.runtime.evaluators.functions.AndDescriptor;
import org.apache.asterix.runtime.evaluators.functions.IsUnknownDescriptor;
import org.apache.asterix.runtime.evaluators.functions.NotDescriptor;
+import org.apache.asterix.runtime.operators.LSMIndexBulkLoadOperatorDescriptor;
+import org.apache.asterix.runtime.operators.LSMIndexBulkLoadOperatorDescriptor.BulkLoadUsage;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraint;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksPartitionConstraintHelper;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
@@ -71,6 +71,8 @@
import org.apache.hyracks.dataflow.std.file.IFileSplitProvider;
import org.apache.hyracks.dataflow.std.sort.ExternalSortOperatorDescriptor;
import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.dataflow.IndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.dataflow.IndexDropOperatorDescriptor.DropOption;
import org.apache.hyracks.storage.am.common.dataflow.TreeIndexBulkLoadOperatorDescriptor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
@@ -124,8 +126,8 @@
this.index = index;
this.physOptConf = physOptConf;
this.metadataProvider = metadataProvider;
- this.itemType = (ARecordType) metadataProvider.findType(dataset.getItemTypeDataverseName(),
- dataset.getItemTypeName());
+ this.itemType =
+ (ARecordType) metadataProvider.findType(dataset.getItemTypeDataverseName(), dataset.getItemTypeName());
this.metaType = DatasetUtil.getMetaType(metadataProvider, dataset);
Pair<ARecordType, ARecordType> enforcedTypes = getEnforcedType(index, itemType, metaType);
this.enforcedItemType = enforcedTypes.first;
@@ -341,11 +343,15 @@
return sortOp;
}
- protected TreeIndexBulkLoadOperatorDescriptor createTreeIndexBulkLoadOp(JobSpecification spec,
+ protected LSMIndexBulkLoadOperatorDescriptor createTreeIndexBulkLoadOp(JobSpecification spec,
int[] fieldPermutation, IIndexDataflowHelperFactory dataflowHelperFactory, float fillFactor)
throws AlgebricksException {
- TreeIndexBulkLoadOperatorDescriptor treeIndexBulkLoadOp = new TreeIndexBulkLoadOperatorDescriptor(spec,
- secondaryRecDesc, fieldPermutation, fillFactor, false, numElementsHint, false, dataflowHelperFactory);
+ IndexDataflowHelperFactory primaryIndexDataflowHelperFactory = new IndexDataflowHelperFactory(
+ metadataProvider.getStorageComponentProvider().getStorageManager(), primaryFileSplitProvider);
+
+ LSMIndexBulkLoadOperatorDescriptor treeIndexBulkLoadOp = new LSMIndexBulkLoadOperatorDescriptor(spec,
+ secondaryRecDesc, fieldPermutation, fillFactor, false, numElementsHint, false, dataflowHelperFactory,
+ primaryIndexDataflowHelperFactory, BulkLoadUsage.CREATE_INDEX, dataset.getDatasetId());
AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, treeIndexBulkLoadOp,
secondaryPartitionConstraint);
return treeIndexBulkLoadOp;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
index 077e431..3626f16 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryInvertedIndexOperationsHelper.java
@@ -22,7 +22,7 @@
import org.apache.asterix.common.config.GlobalConfig;
import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.exceptions.ErrorCode;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.dataflow.data.nontagged.MissingWriterFactory;
import org.apache.asterix.metadata.declared.MetadataProvider;
import org.apache.asterix.metadata.entities.Dataset;
@@ -208,14 +208,14 @@
@Override
public JobSpecification buildLoadingJobSpec() throws AlgebricksException {
JobSpecification spec = RuntimeUtils.createJobSpecification(metadataProvider.getApplicationContext());
- JobId jobId = IndexUtil.bindJobEventListener(spec, metadataProvider);
+ TxnId txnId = IndexUtil.bindJobEventListener(spec, metadataProvider);
// Create dummy key provider for feeding the primary index scan.
IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset, metadataProvider);
// Create primary index scan op.
IOperatorDescriptor primaryScanOp =
- DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, dataset, jobId);
+ DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, dataset, txnId);
IOperatorDescriptor sourceOp = primaryScanOp;
boolean isOverridingKeyFieldTypes = index.isOverridingKeyFieldTypes();
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
index 1726470..613df21 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryRTreeOperationsHelper.java
@@ -23,7 +23,7 @@
import org.apache.asterix.common.config.DatasetConfig.DatasetType;
import org.apache.asterix.common.config.GlobalConfig;
import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.external.indexing.IndexingConstants;
import org.apache.asterix.external.operators.ExternalScanOperatorDescriptor;
import org.apache.asterix.formats.nontagged.BinaryComparatorFactoryProvider;
@@ -172,7 +172,7 @@
}
@Override
- public JobSpecification buildLoadingJobSpec() throws AsterixException, AlgebricksException {
+ public JobSpecification buildLoadingJobSpec() throws AlgebricksException {
/***************************************************
* [ About PointMBR Optimization ]
* Instead of storing a MBR(4 doubles) for a point(2 doubles) in RTree leaf node,
@@ -201,11 +201,11 @@
if (dataset.getDatasetType() == DatasetType.INTERNAL) {
// Create dummy key provider for feeding the primary index scan.
IOperatorDescriptor keyProviderOp = DatasetUtil.createDummyKeyProviderOp(spec, dataset, metadataProvider);
- JobId jobId = IndexUtil.bindJobEventListener(spec, metadataProvider);
+ TxnId txnId = IndexUtil.bindJobEventListener(spec, metadataProvider);
// Create primary index scan op.
IOperatorDescriptor primaryScanOp = DatasetUtil.createPrimaryIndexScanOp(spec, metadataProvider, dataset,
- jobId);
+ txnId);
// Assign op.
IOperatorDescriptor sourceOp = primaryScanOp;
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryTreeIndexOperationsHelper.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryTreeIndexOperationsHelper.java
index b63ea16..185cf8c 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryTreeIndexOperationsHelper.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SecondaryTreeIndexOperationsHelper.java
@@ -59,7 +59,7 @@
IResourceFactory resourceFactory = dataset.getResourceFactory(metadataProvider, index, itemType, metaType,
mergePolicyFactory, mergePolicyProperties);
IIndexBuilderFactory indexBuilderFactory = new IndexBuilderFactory(storageComponentProvider.getStorageManager(),
- secondaryFileSplitProvider, resourceFactory, !dataset.isTemp());
+ secondaryFileSplitProvider, resourceFactory, true);
IndexCreateOperatorDescriptor secondaryIndexCreateOp =
new IndexCreateOperatorDescriptor(spec, indexBuilderFactory);
AlgebricksPartitionConstraintHelper.setPartitionConstraintInJobSpec(spec, secondaryIndexCreateOp,
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SplitsAndConstraintsUtil.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SplitsAndConstraintsUtil.java
index 5b7ea59..e5f5c19 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SplitsAndConstraintsUtil.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/utils/SplitsAndConstraintsUtil.java
@@ -25,7 +25,6 @@
import org.apache.asterix.common.cluster.ClusterPartition;
import org.apache.asterix.common.cluster.IClusterStateManager;
import org.apache.asterix.common.config.ClusterProperties;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.common.utils.StoragePathUtil;
import org.apache.asterix.metadata.MetadataManager;
import org.apache.asterix.metadata.MetadataTransactionContext;
@@ -59,16 +58,12 @@
public static FileSplit[] getIndexSplits(IClusterStateManager clusterStateManager, Dataset dataset,
String indexName, MetadataTransactionContext mdTxnCtx) throws AlgebricksException {
- try {
- NodeGroup nodeGroup = MetadataManager.INSTANCE.getNodegroup(mdTxnCtx, dataset.getNodeGroupName());
- if (nodeGroup == null) {
- throw new AlgebricksException("Couldn't find node group " + dataset.getNodeGroupName());
- }
- List<String> nodeList = nodeGroup.getNodeNames();
- return getIndexSplits(clusterStateManager, dataset, indexName, nodeList);
- } catch (MetadataException me) {
- throw new AlgebricksException(me);
+ NodeGroup nodeGroup = MetadataManager.INSTANCE.getNodegroup(mdTxnCtx, dataset.getNodeGroupName());
+ if (nodeGroup == null) {
+ throw new AlgebricksException("Couldn't find node group " + dataset.getNodeGroupName());
}
+ List<String> nodeList = nodeGroup.getNodeNames();
+ return getIndexSplits(clusterStateManager, dataset, indexName, nodeList);
}
public static FileSplit[] getIndexSplits(IClusterStateManager clusterStateManager, Dataset dataset,
@@ -88,9 +83,7 @@
for (int k = 0; k < numPartitions; k++) {
// format: 'storage dir name'/partition_#/dataverse/dataset_idx_index
File f = new File(StoragePathUtil.prepareStoragePartitionPath(storageDirName,
- nodePartitions[k].getPartitionId())
- + (dataset.isTemp() ? (File.separator + StoragePathUtil.TEMP_DATASETS_STORAGE_FOLDER) : "")
- + File.separator + relPathFile);
+ nodePartitions[k].getPartitionId()) + File.separator + relPathFile);
splits.add(StoragePathUtil.getFileSplitForClusterPartition(nodePartitions[k], f.getPath()));
}
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/MetadataEntityValueExtractor.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/MetadataEntityValueExtractor.java
index ff65994..54d94a9 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/MetadataEntityValueExtractor.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/MetadataEntityValueExtractor.java
@@ -21,10 +21,10 @@
import java.rmi.RemoteException;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.api.IMetadataEntityTupleTranslator;
import org.apache.asterix.metadata.api.IValueExtractor;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -39,8 +39,8 @@
}
@Override
- public T getValue(JobId jobId, ITupleReference tuple)
- throws MetadataException, HyracksDataException, RemoteException {
+ public T getValue(TxnId txnId, ITupleReference tuple)
+ throws AlgebricksException, HyracksDataException, RemoteException {
return tupleReaderWriter.getMetadataEntityFromTuple(tuple);
}
}
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/NestedDatatypeNameValueExtractor.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/NestedDatatypeNameValueExtractor.java
index 5f0525b..cf02930 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/NestedDatatypeNameValueExtractor.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/NestedDatatypeNameValueExtractor.java
@@ -24,9 +24,9 @@
import java.io.DataInputStream;
import java.io.IOException;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.api.IValueExtractor;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.util.string.UTF8StringReader;
@@ -49,7 +49,7 @@
private final UTF8StringReader reader = new UTF8StringReader();
@Override
- public String getValue(JobId jobId, ITupleReference tuple) throws MetadataException, HyracksDataException {
+ public String getValue(TxnId txnId, ITupleReference tuple) throws AlgebricksException, HyracksDataException {
byte[] serRecord = tuple.getFieldData(2);
int recordStartOffset = tuple.getFieldStart(2);
int recordLength = tuple.getFieldLength(2);
diff --git a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java
index 1928d7e..8960ba6 100644
--- a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java
+++ b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/valueextractors/TupleCopyValueExtractor.java
@@ -21,9 +21,9 @@
import java.nio.ByteBuffer;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.metadata.api.IValueExtractor;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ITypeTraits;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
@@ -48,7 +48,8 @@
}
@Override
- public ITupleReference getValue(JobId jobId, ITupleReference tuple) throws MetadataException, HyracksDataException {
+ public ITupleReference getValue(TxnId txnId, ITupleReference tuple)
+ throws AlgebricksException, HyracksDataException {
int numBytes = tupleWriter.bytesRequired(tuple);
tupleBytes = new byte[numBytes];
tupleWriter.writeTuple(tuple, tupleBytes, 0);
diff --git a/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslatorTest.java b/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslatorTest.java
index e5d0d7d..b87ef2a 100644
--- a/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslatorTest.java
+++ b/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/DatasetTupleTranslatorTest.java
@@ -30,6 +30,7 @@
import org.apache.asterix.metadata.entities.InternalDatasetDetails.FileStructure;
import org.apache.asterix.metadata.entities.InternalDatasetDetails.PartitioningStrategy;
import org.apache.asterix.om.types.BuiltinType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.junit.Assert;
import org.junit.Test;
@@ -37,7 +38,7 @@
public class DatasetTupleTranslatorTest {
@Test
- public void test() throws MetadataException, IOException {
+ public void test() throws AlgebricksException, IOException {
Integer[] indicators = { 0, 1, null };
for (Integer indicator : indicators) {
Map<String, String> compactionPolicyProperties = new HashMap<>();
@@ -48,7 +49,7 @@
Collections.singletonList(Collections.singletonList("row_id")),
Collections.singletonList(Collections.singletonList("row_id")),
indicator == null ? null : Collections.singletonList(indicator),
- Collections.singletonList(BuiltinType.AINT64), false, Collections.emptyList(), false);
+ Collections.singletonList(BuiltinType.AINT64), false, Collections.emptyList());
Dataset dataset =
new Dataset("test", "log", "foo", "LogType", "CB", "MetaType", "DEFAULT_NG_ALL_NODES", "prefix",
diff --git a/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslatorTest.java b/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslatorTest.java
index cdbaad3..ab4229c 100644
--- a/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslatorTest.java
+++ b/asterixdb/asterix-metadata/src/test/java/org/apache/asterix/metadata/entitytupletranslators/IndexTupleTranslatorTest.java
@@ -41,6 +41,7 @@
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.BuiltinType;
import org.apache.asterix.om.types.IAType;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.junit.Assert;
import org.junit.Test;
@@ -48,7 +49,7 @@
public class IndexTupleTranslatorTest {
@Test
- public void test() throws MetadataException, IOException {
+ public void test() throws AlgebricksException, IOException {
Integer[] indicators = { 0, 1, null };
for (Integer indicator : indicators) {
Map<String, String> compactionPolicyProperties = new HashMap<>();
@@ -59,7 +60,7 @@
Collections.singletonList(Collections.singletonList("row_id")),
Collections.singletonList(Collections.singletonList("row_id")),
indicator == null ? null : Collections.singletonList(indicator),
- Collections.singletonList(BuiltinType.AINT64), false, Collections.emptyList(), false);
+ Collections.singletonList(BuiltinType.AINT64), false, Collections.emptyList());
Dataset dataset =
new Dataset("test", "d1", "foo", "LogType", "CB", "MetaType", "DEFAULT_NG_ALL_NODES", "prefix",
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/ExpressionTypeComputer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/ExpressionTypeComputer.java
index 5933dd9..e4cf000 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/ExpressionTypeComputer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/common/ExpressionTypeComputer.java
@@ -68,7 +68,7 @@
FunctionIdentifier fi = expr.getFunctionIdentifier();
// Note: built-in functions + udfs
IResultTypeComputer rtc;
- FunctionSignature signature = new FunctionSignature(fi.getNamespace(), fi.getName(), fi.getArity());
+ FunctionSignature signature = new FunctionSignature(fi);
if (BuiltinFunctions.isBuiltinCompilerFunction(signature, true)) {
rtc = BuiltinFunctions.getResultTypeComputer(fi);
} else {
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
index df720f1..9307627 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AOrderedListSerializerDeserializer.java
@@ -25,7 +25,6 @@
import java.util.List;
import org.apache.asterix.builders.OrderedListBuilder;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.formats.nontagged.SerializerDeserializerProvider;
import org.apache.asterix.om.base.AOrderedList;
import org.apache.asterix.om.base.IAObject;
@@ -97,7 +96,7 @@
}
AOrderedListType type = new AOrderedListType(currentItemType, "orderedlist");
return new AOrderedList(type, items);
- } catch (AsterixException | IOException e) {
+ } catch (IOException e) {
throw HyracksDataException.create(e);
}
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java
index b9afeb0..438a9bf 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/serde/AUnorderedListSerializerDeserializer.java
@@ -36,6 +36,7 @@
import org.apache.asterix.om.types.IAType;
import org.apache.asterix.om.types.TypeTagUtil;
import org.apache.asterix.om.utils.NonTaggedFormatUtil;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.dataflow.value.ISerializerDeserializer;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.util.ArrayBackedValueStorage;
@@ -98,7 +99,7 @@
}
AUnorderedListType type = new AUnorderedListType(currentItemType, "unorderedlist");
return new AUnorderedList(type, items);
- } catch (AsterixException | IOException e) {
+ } catch (IOException e) {
throw HyracksDataException.create(e);
}
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
index 863847b..e59c600 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
@@ -825,7 +825,7 @@
public static final FunctionIdentifier NUMERIC_ADD = AlgebricksBuiltinFunctions.NUMERIC_ADD;
public static final FunctionIdentifier IS_MISSING = AlgebricksBuiltinFunctions.IS_MISSING;
public static final FunctionIdentifier IS_NULL = AlgebricksBuiltinFunctions.IS_NULL;
- public static final FunctionIdentifier IS_UNKOWN = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
+ public static final FunctionIdentifier IS_UNKNOWN = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
"is-unknown", 1);
public static final FunctionIdentifier IS_BOOLEAN = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
"is-boolean", 1);
@@ -864,6 +864,9 @@
public static final FunctionIdentifier EXTERNAL_LOOKUP = new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
"external-lookup", FunctionIdentifier.VARARGS);
+ public static final FunctionIdentifier GET_JOB_PARAMETER =
+ new FunctionIdentifier(FunctionConstants.ASTERIX_NS, "get-job-param", 1);
+
public static final FunctionIdentifier META = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, "meta",
FunctionIdentifier.VARARGS);
public static final FunctionIdentifier META_KEY = new FunctionIdentifier(FunctionConstants.ASTERIX_NS, "meta-key",
@@ -883,7 +886,7 @@
// first, take care of Algebricks builtin functions
addFunction(IS_MISSING, BooleanOnlyTypeComputer.INSTANCE, true);
- addFunction(IS_UNKOWN, BooleanOnlyTypeComputer.INSTANCE, true);
+ addFunction(IS_UNKNOWN, BooleanOnlyTypeComputer.INSTANCE, true);
addFunction(IS_NULL, BooleanOrMissingTypeComputer.INSTANCE, true);
addFunction(IS_SYSTEM_NULL, ABooleanTypeComputer.INSTANCE, true);
addFunction(IS_BOOLEAN, ABooleanTypeComputer.INSTANCE, true);
@@ -1274,6 +1277,9 @@
// external lookup
addPrivateFunction(EXTERNAL_LOOKUP, AnyTypeComputer.INSTANCE, false);
+ // get job parameter
+ addFunction(GET_JOB_PARAMETER, AnyTypeComputer.INSTANCE, false);
+
// unnesting function
addPrivateFunction(SCAN_COLLECTION, CollectionMemberResultType.INSTANCE, true);
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfoRepository.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfoRepository.java
index b4622b5..20839f9 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfoRepository.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/FunctionInfoRepository.java
@@ -29,12 +29,12 @@
private final Map<FunctionSignature, IFunctionInfo> functionMap;
public FunctionInfoRepository() {
- functionMap = new ConcurrentHashMap<FunctionSignature, IFunctionInfo>();
+ functionMap = new ConcurrentHashMap<>();
}
public IFunctionInfo get(String namespace, String name, int arity) {
- FunctionSignature fname = new FunctionSignature(namespace, name, arity);
- return functionMap.get(fname);
+ FunctionSignature functionSignature = new FunctionSignature(namespace, name, arity);
+ return functionMap.get(functionSignature);
}
public IFunctionInfo get(FunctionIdentifier fid) {
@@ -42,7 +42,7 @@
}
public void put(FunctionIdentifier fid, IFunctionInfo fInfo) {
- FunctionSignature functionSignature = new FunctionSignature(fid.getNamespace(), fid.getName(), fid.getArity());
+ FunctionSignature functionSignature = new FunctionSignature(fid);
functionMap.put(functionSignature, fInfo);
}
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java
index 3322924..5f463e6 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/PointableAllocator.java
@@ -19,7 +19,6 @@
package org.apache.asterix.om.pointables;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
import org.apache.asterix.om.types.AOrderedListType;
@@ -30,6 +29,7 @@
import org.apache.asterix.om.util.container.IObjectFactory;
import org.apache.asterix.om.util.container.IObjectPool;
import org.apache.asterix.om.util.container.ListObjectPool;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
/**
* This class is the ONLY place to create IVisitablePointable object instances,
@@ -95,7 +95,7 @@
* @param typeTag
* @return the pointable object
*/
- public IVisitablePointable allocateFieldValue(ATypeTag typeTag, byte[] b, int offset) throws AsterixException {
+ public IVisitablePointable allocateFieldValue(ATypeTag typeTag, byte[] b, int offset) throws HyracksDataException {
if (typeTag == null)
return flatValueAllocator.allocate(null);
else if (typeTag.equals(ATypeTag.OBJECT))
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java
index 7a2efe0..114ff2b 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/AListPointable.java
@@ -190,7 +190,7 @@
}
public void getItemValue(AbstractCollectionType inputType, int index, DataOutput dOut)
- throws IOException, AsterixException {
+ throws IOException {
if (getType() != ATypeTag.ANY.serialize()) {
dOut.writeByte(getType());
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
index 0aa256f..af7e29f 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/pointables/nonvisitor/ARecordPointable.java
@@ -220,7 +220,7 @@
// -----------------------
public void getClosedFieldValue(ARecordType recordType, int fieldId, DataOutput dOut)
- throws IOException, AsterixException {
+ throws IOException {
if (isClosedFieldNull(recordType, fieldId)) {
dOut.writeByte(ATypeTag.SERIALIZED_NULL_TYPE_TAG);
} else if (isClosedFieldMissing(recordType, fieldId)) {
@@ -287,7 +287,7 @@
// -----------------------
public void getOpenFieldValue(ARecordType recordType, int fieldId, DataOutput dOut)
- throws IOException, AsterixException {
+ throws IOException {
dOut.write(bytes, getOpenFieldValueOffset(recordType, fieldId), getOpenFieldValueSize(recordType, fieldId));
}
diff --git a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java
index 5d91d2f..cfc1b55 100644
--- a/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java
+++ b/asterixdb/asterix-om/src/main/java/org/apache/asterix/om/types/TypeTagUtil.java
@@ -18,13 +18,13 @@
*/
package org.apache.asterix.om.types;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.utils.RecordUtil;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
public class TypeTagUtil {
- public static IAType getBuiltinTypeByTag(ATypeTag typeTag) throws AsterixException {
+ public static IAType getBuiltinTypeByTag(ATypeTag typeTag) throws HyracksDataException {
switch (typeTag) {
case TINYINT:
return BuiltinType.AINT8;
@@ -89,7 +89,8 @@
case ARRAY:
return AOrderedListType.FULL_OPEN_ORDEREDLIST_TYPE;
default:
- throw new AsterixException("Typetag " + typeTag + " is not a built-in type");
+ // TODO(tillw) should be an internal error
+ throw new HyracksDataException("Typetag " + typeTag + " is not a built-in type");
}
}
diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/NetworkingUtil.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/NetworkingUtil.java
index 62c1e4a..c93920f 100644
--- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/NetworkingUtil.java
+++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/NetworkingUtil.java
@@ -23,13 +23,17 @@
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.net.NetworkInterface;
+import java.net.SocketAddress;
import java.net.SocketException;
+import java.net.UnknownHostException;
import java.nio.ByteBuffer;
import java.nio.MappedByteBuffer;
import java.nio.channels.FileChannel;
import java.nio.channels.SocketChannel;
import java.util.Enumeration;
+import org.apache.hyracks.api.comm.NetworkAddress;
+
public class NetworkingUtil {
private NetworkingUtil() {
@@ -119,4 +123,8 @@
int port = socketChannel.socket().getPort();
return InetSocketAddress.createUnresolved(hostAddress, port);
}
+
+ public static SocketAddress getSocketAddress(NetworkAddress netAddr) throws UnknownHostException {
+ return new InetSocketAddress(InetAddress.getByAddress(netAddr.lookupIpAddress()), netAddr.getPort());
+ }
}
diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
index 5e58802..9d8c351 100644
--- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
+++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationChannel.java
@@ -470,7 +470,7 @@
case LogType.JOB_COMMIT:
case LogType.ABORT:
LogRecord jobTerminationLog = new LogRecord();
- TransactionUtil.formJobTerminateLogRecord(jobTerminationLog, remoteLog.getJobId(),
+ TransactionUtil.formJobTerminateLogRecord(jobTerminationLog, remoteLog.getTxnId(),
remoteLog.getLogType() == LogType.JOB_COMMIT);
jobTerminationLog.setReplicationThread(this);
jobTerminationLog.setLogSource(LogSource.REMOTE);
@@ -523,7 +523,7 @@
LogRecord logRecord = pendingNotificationRemoteLogsQ.take();
//send ACK to requester
logRecord.getReplicationThread().getReplicationClientSocket().socket().getOutputStream()
- .write((localNodeID + ReplicationProtocol.JOB_REPLICATION_ACK + logRecord.getJobId()
+ .write((localNodeID + ReplicationProtocol.JOB_REPLICATION_ACK + logRecord.getTxnId()
+ System.lineSeparator()).getBytes());
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
diff --git a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java
index 126114b..b0aa0fb 100644
--- a/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java
+++ b/asterixdb/asterix-replication/src/main/java/org/apache/asterix/replication/management/ReplicationManager.java
@@ -99,8 +99,8 @@
private static final int MAX_JOB_COMMIT_ACK_WAIT = 10000;
private final String nodeId;
private ExecutorService replicationListenerThreads;
- private final Map<Integer, Set<String>> jobCommitAcks;
- private final Map<Integer, ILogRecord> replicationJobsPendingAcks;
+ private final Map<Long, Set<String>> txnCommitAcks;
+ private final Map<Long, ILogRecord> replicationTxnsPendingAcks;
private ByteBuffer dataBuffer;
private final LinkedBlockingQueue<IReplicationJob> replicationJobsQ;
private final LinkedBlockingQueue<ReplicaEvent> replicaEventsQ;
@@ -157,8 +157,8 @@
terminateJobsReplication = new AtomicBoolean(false);
jobsReplicationSuspended = new AtomicBoolean(true);
replicationSuspended = new AtomicBoolean(true);
- jobCommitAcks = new ConcurrentHashMap<>();
- replicationJobsPendingAcks = new ConcurrentHashMap<>();
+ txnCommitAcks = new ConcurrentHashMap<>();
+ replicationTxnsPendingAcks = new ConcurrentHashMap<>();
shuttingDownReplicaIds = new HashSet<>();
dataBuffer = ByteBuffer.allocate(INITIAL_BUFFER_SIZE);
replicationMonitor = new ReplicasEventsMonitor();
@@ -228,7 +228,7 @@
}
Set<String> replicaIds = Collections.synchronizedSet(new HashSet<String>());
replicaIds.add(nodeId);
- jobCommitAcks.put(logRecord.getJobId(), replicaIds);
+ txnCommitAcks.put(logRecord.getTxnId(), replicaIds);
}
appendToLogBuffer(logRecord);
@@ -580,16 +580,16 @@
//wait for any ACK to arrive before closing sockets.
if (logsRepSockets != null) {
- synchronized (jobCommitAcks) {
+ synchronized (txnCommitAcks) {
try {
long waitStartTime = System.currentTimeMillis();
- while (!jobCommitAcks.isEmpty()) {
- jobCommitAcks.wait(1000);
+ while (!txnCommitAcks.isEmpty()) {
+ txnCommitAcks.wait(1000);
long waitDuration = System.currentTimeMillis() - waitStartTime;
if (waitDuration > MAX_JOB_COMMIT_ACK_WAIT) {
LOGGER.log(Level.SEVERE,
- "Timeout before receving all job ACKs from replicas. Pending jobs ("
- + jobCommitAcks.keySet().toString() + ")");
+ "Timeout before receving all job ACKs from replicas. Pending txns ("
+ + txnCommitAcks.keySet().toString() + ")");
break;
}
}
@@ -747,9 +747,9 @@
if (newState == ReplicaState.DEAD) {
//assume the dead replica ACK has been received for all pending jobs
- synchronized (jobCommitAcks) {
- for (Integer jobId : jobCommitAcks.keySet()) {
- addAckToJob(jobId, replicaId);
+ synchronized (txnCommitAcks) {
+ for (Long txnId : txnCommitAcks.keySet()) {
+ addAckToJob(txnId, replicaId);
}
}
}
@@ -777,27 +777,27 @@
/**
* When an ACK for a JOB_COMMIT is received, it is added to the corresponding job.
*
- * @param jobId
+ * @param txnId
* @param replicaId
* The remote replica id the ACK received from.
*/
- private void addAckToJob(int jobId, String replicaId) {
- synchronized (jobCommitAcks) {
+ private void addAckToJob(long txnId, String replicaId) {
+ synchronized (txnCommitAcks) {
//add ACK to the job
- if (jobCommitAcks.containsKey(jobId)) {
- Set<String> replicaIds = jobCommitAcks.get(jobId);
+ if (txnCommitAcks.containsKey(txnId)) {
+ Set<String> replicaIds = txnCommitAcks.get(txnId);
replicaIds.add(replicaId);
} else {
if (LOGGER.isLoggable(Level.WARNING)) {
- LOGGER.warning("Invalid job replication ACK received for jobId(" + jobId + ")");
+ LOGGER.warning("Invalid job replication ACK received for txnId(" + txnId + ")");
}
return;
}
//if got ACKs from all remote replicas, notify pending jobs if any
- if (jobCommitAcks.get(jobId).size() == replicationFactor && replicationJobsPendingAcks.containsKey(jobId)) {
- ILogRecord pendingLog = replicationJobsPendingAcks.get(jobId);
+ if (txnCommitAcks.get(txnId).size() == replicationFactor && replicationTxnsPendingAcks.containsKey(txnId)) {
+ ILogRecord pendingLog = replicationTxnsPendingAcks.get(txnId);
synchronized (pendingLog) {
pendingLog.notifyAll();
}
@@ -807,23 +807,23 @@
@Override
public boolean hasBeenReplicated(ILogRecord logRecord) {
- int jobId = logRecord.getJobId();
- if (jobCommitAcks.containsKey(jobId)) {
- synchronized (jobCommitAcks) {
+ long txnId = logRecord.getTxnId();
+ if (txnCommitAcks.containsKey(txnId)) {
+ synchronized (txnCommitAcks) {
//check if all ACKs have been received
- if (jobCommitAcks.get(jobId).size() == replicationFactor) {
- jobCommitAcks.remove(jobId);
+ if (txnCommitAcks.get(txnId).size() == replicationFactor) {
+ txnCommitAcks.remove(txnId);
//remove from pending jobs if exists
- replicationJobsPendingAcks.remove(jobId);
+ replicationTxnsPendingAcks.remove(txnId);
//notify any threads waiting for all jobs to finish
- if (jobCommitAcks.size() == 0) {
- jobCommitAcks.notifyAll();
+ if (txnCommitAcks.size() == 0) {
+ txnCommitAcks.notifyAll();
}
return true;
} else {
- replicationJobsPendingAcks.putIfAbsent(jobId, logRecord);
+ replicationTxnsPendingAcks.putIfAbsent(txnId, logRecord);
return false;
}
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java
index a7160ac..b93d613 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/common/FullTextContainsEvaluator.java
@@ -335,6 +335,8 @@
* for that option. (e.g., argOptions[0] = "mode", argOptions[1] = "all")
*/
private void setFullTextOption(IPointable[] argOptions, int uniqueQueryTokenCount) throws HyracksDataException {
+ // By default, we conduct a conjunctive search.
+ occurrenceThreshold = uniqueQueryTokenCount;
for (int i = 0; i < optionArgsLength; i = i + 2) {
// mode option
if (compareStrInByteArrayAndPointable(FullTextContainsDescriptor.getSearchModeOptionArray(), argOptions[i],
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java
index 0c397f0..1faf75c 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/comparisons/DeepEqualAssessor.java
@@ -43,7 +43,7 @@
private final DeepEqualityVisitor equalityVisitor = new DeepEqualityVisitor();
public boolean isEqual(IVisitablePointable leftPointable, IVisitablePointable rightPointable)
- throws HyracksDataException, AsterixException {
+ throws HyracksDataException {
if (leftPointable == null || rightPointable == null) {
return false;
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java
index 1f9909c..95b6ef6 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/AbstractUnaryStringStringEval.java
@@ -22,8 +22,8 @@
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.asterix.runtime.exceptions.TypeMismatchException;
import org.apache.asterix.om.types.ATypeTag;
+import org.apache.asterix.runtime.exceptions.TypeMismatchException;
import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
@@ -57,7 +57,6 @@
this.funcID = funcID;
}
- @SuppressWarnings("unchecked")
@Override
public void evaluate(IFrameTupleReference tuple, IPointable resultPointable) throws HyracksDataException {
resultStorage.reset();
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/GetJobParameterByNameDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/GetJobParameterByNameDescriptor.java
new file mode 100644
index 0000000..17f7a96
--- /dev/null
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/GetJobParameterByNameDescriptor.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.runtime.evaluators.functions;
+
+import java.io.IOException;
+
+import org.apache.asterix.om.functions.BuiltinFunctions;
+import org.apache.asterix.om.functions.IFunctionDescriptor;
+import org.apache.asterix.om.functions.IFunctionDescriptorFactory;
+import org.apache.asterix.runtime.evaluators.base.AbstractScalarFunctionDynamicDescriptor;
+import org.apache.hyracks.algebricks.core.algebra.functions.FunctionIdentifier;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluator;
+import org.apache.hyracks.algebricks.runtime.base.IScalarEvaluatorFactory;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.api.IPointable;
+import org.apache.hyracks.data.std.primitive.UTF8StringPointable;
+
+public class GetJobParameterByNameDescriptor extends AbstractScalarFunctionDynamicDescriptor {
+ private static final long serialVersionUID = 1L;
+ public static final IFunctionDescriptorFactory FACTORY = new IFunctionDescriptorFactory() {
+ @Override
+ public IFunctionDescriptor createFunctionDescriptor() {
+ return new GetJobParameterByNameDescriptor();
+ }
+ };
+
+ @Override
+ public IScalarEvaluatorFactory createEvaluatorFactory(IScalarEvaluatorFactory[] args) {
+ return new IScalarEvaluatorFactory() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public IScalarEvaluator createScalarEvaluator(IHyracksTaskContext ctx) throws HyracksDataException {
+ return new AbstractUnaryStringStringEval(ctx, args[0],
+ GetJobParameterByNameDescriptor.this.getIdentifier()) {
+ private byte[] result;
+
+ @Override
+ protected void process(UTF8StringPointable inputString, IPointable resultPointable)
+ throws IOException {
+ result = ctx.getJobParameter(inputString.getByteArray(), inputString.getStartOffset(),
+ inputString.getLength());
+ }
+
+ @Override
+ void writeResult(IPointable resultPointable) throws IOException {
+ resultPointable.set(result, 0, result.length);
+ }
+ };
+ }
+ };
+ }
+
+ @Override
+ public FunctionIdentifier getIdentifier() {
+ return BuiltinFunctions.GET_JOB_PARAMETER;
+ }
+
+}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/IsUnknownDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/IsUnknownDescriptor.java
index bf080d3..0a8d86d 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/IsUnknownDescriptor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/IsUnknownDescriptor.java
@@ -61,7 +61,7 @@
@Override
public FunctionIdentifier getIdentifier() {
- return BuiltinFunctions.IS_UNKOWN;
+ return BuiltinFunctions.IS_UNKNOWN;
}
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java
index 5a293f3..df8fc75 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/PointableHelper.java
@@ -21,7 +21,6 @@
import java.io.DataOutput;
import java.io.IOException;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
@@ -41,8 +40,8 @@
*/
public class PointableHelper {
- private static final IBinaryComparator STRING_BINARY_COMPARATOR = PointableBinaryComparatorFactory.of(
- UTF8StringPointable.FACTORY).createBinaryComparator();
+ private static final IBinaryComparator STRING_BINARY_COMPARATOR =
+ PointableBinaryComparatorFactory.of(UTF8StringPointable.FACTORY).createBinaryComparator();
private final UTF8StringWriter utf8Writer;
public PointableHelper() {
@@ -112,7 +111,7 @@
* @param writeTag
* Specifying whether a tag for the string should also be written
*/
- public void serializeString(String str, IMutableValueStorage vs, boolean writeTag) throws AsterixException {
+ public void serializeString(String str, IMutableValueStorage vs, boolean writeTag) throws HyracksDataException {
vs.reset();
try {
DataOutput output = vs.getDataOutput();
@@ -121,7 +120,7 @@
}
utf8Writer.writeUTF8(str, output);
} catch (IOException e) {
- throw new AsterixException("Could not serialize " + str);
+ throw new HyracksDataException("Could not serialize " + str);
}
}
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java
index 72d2e69..2019b55 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/GetRecordFieldsEvalFactory.java
@@ -78,8 +78,6 @@
rfu.processRecord(recordPointable, recordType, out, 0);
} catch (IOException e) {
throw new HyracksDataException(e);
- } catch (AsterixException e) {
- throw new HyracksDataException(e);
}
result.set(resultStorage);
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java
index 97a9ee0..71a8291 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordAddFieldsDescriptor.java
@@ -113,12 +113,8 @@
final ArrayBackedValueStorage fieldNamePointable = new ArrayBackedValueStorage();
final ArrayBackedValueStorage fieldValuePointer = new ArrayBackedValueStorage();
final PointableHelper pointableHelper = new PointableHelper();
- try {
- pointableHelper.serializeString("field-name", fieldNamePointable, true);
- pointableHelper.serializeString("field-value", fieldValuePointer, true);
- } catch (AsterixException e) {
- throw new HyracksDataException(e);
- }
+ pointableHelper.serializeString("field-name", fieldNamePointable, true);
+ pointableHelper.serializeString("field-value", fieldValuePointer, true);
return new IScalarEvaluator() {
public static final int TABLE_FRAME_SIZE = 32768; // the default 32k frame size
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java
index 6127c28..6c0eb06 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordFieldsUtil.java
@@ -82,7 +82,7 @@
private final static ARecordType openType = DefaultOpenFieldType.NESTED_OPEN_RECORD_TYPE;
public void processRecord(ARecordPointable recordAccessor, ARecordType recType, DataOutput out, int level)
- throws IOException, AsterixException {
+ throws IOException {
if (level == 0) {
// Resets pools for recycling objects before processing a top-level record.
resetPools();
@@ -176,7 +176,7 @@
}
public void addNameField(IValueReference nameArg, IARecordBuilder fieldRecordBuilder)
- throws HyracksDataException, AsterixException {
+ throws HyracksDataException {
ArrayBackedValueStorage fieldAbvs = getTempBuffer();
fieldAbvs.reset();
@@ -185,7 +185,7 @@
}
public void addFieldType(byte tagId, IARecordBuilder fieldRecordBuilder)
- throws HyracksDataException, AsterixException {
+ throws HyracksDataException {
ArrayBackedValueStorage fieldAbvs = getTempBuffer();
ArrayBackedValueStorage valueAbvs = getTempBuffer();
@@ -202,7 +202,7 @@
}
public void addIsOpenField(boolean isOpen, IARecordBuilder fieldRecordBuilder)
- throws HyracksDataException, AsterixException {
+ throws HyracksDataException {
ArrayBackedValueStorage fieldAbvs = getTempBuffer();
ArrayBackedValueStorage valueAbvs = getTempBuffer();
@@ -220,7 +220,7 @@
}
public void addListField(IValueReference listArg, IAType fieldType, IARecordBuilder fieldRecordBuilder, int level)
- throws AsterixException, IOException {
+ throws IOException {
ArrayBackedValueStorage fieldAbvs = getTempBuffer();
ArrayBackedValueStorage valueAbvs = getTempBuffer();
@@ -234,7 +234,7 @@
}
public void addNestedField(IValueReference recordArg, IAType fieldType, IARecordBuilder fieldRecordBuilder,
- int level) throws IOException, AsterixException {
+ int level) throws IOException {
ArrayBackedValueStorage fieldAbvs = getTempBuffer();
ArrayBackedValueStorage valueAbvs = getTempBuffer();
@@ -256,7 +256,7 @@
}
public void processListValue(IValueReference listArg, IAType fieldType, DataOutput out, int level)
- throws AsterixException, IOException {
+ throws IOException {
ArrayBackedValueStorage itemValue = getTempBuffer();
IARecordBuilder listRecordBuilder = getRecordBuilder();
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java
index ce7ed6e..63b58ed 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordMergeDescriptor.java
@@ -24,7 +24,6 @@
import java.util.List;
import org.apache.asterix.builders.RecordBuilder;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.ErrorCode;
import org.apache.asterix.common.exceptions.RuntimeDataException;
import org.apache.asterix.om.functions.BuiltinFunctions;
@@ -132,7 +131,7 @@
try {
mergeFields(outRecType, rp0, rp1, true, 0);
rbStack.get(0).write(out, true);
- } catch (IOException | AsterixException e) {
+ } catch (IOException e) {
throw new HyracksDataException(e);
}
result.set(resultStorage);
@@ -140,7 +139,7 @@
private void mergeFields(ARecordType combinedType, ARecordVisitablePointable leftRecord,
ARecordVisitablePointable rightRecord, boolean openFromParent, int nestedLevel)
- throws IOException, AsterixException, HyracksDataException {
+ throws IOException {
if (rbStack.size() < (nestedLevel + 1)) {
rbStack.add(new RecordBuilder());
}
@@ -207,7 +206,7 @@
*/
private void addFieldToSubRecord(ARecordType combinedType, IVisitablePointable fieldNamePointable,
IVisitablePointable leftValue, IVisitablePointable rightValue, boolean openFromParent,
- int nestedLevel) throws IOException, AsterixException, HyracksDataException {
+ int nestedLevel) throws IOException {
runtimeRecordTypeInfo.reset(combinedType);
int pos = runtimeRecordTypeInfo.getFieldIndex(fieldNamePointable.getByteArray(),
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java
index 2f55cd7..74f7259 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/records/RecordRemoveFieldsEvalFactory.java
@@ -118,7 +118,7 @@
rbStack.clear();
processRecord(requiredRecType, recordPointable, listPointable, 0);
rbStack.get(0).write(out, true);
- } catch (IOException | AsterixException e) {
+ } catch (IOException e) {
throw new HyracksDataException(e);
}
result.set(resultStorage);
@@ -126,7 +126,7 @@
private void processRecord(ARecordType requiredType, ARecordVisitablePointable srp,
AListVisitablePointable inputList, int nestedLevel)
- throws IOException, AsterixException, HyracksDataException {
+ throws IOException {
if (rbStack.size() < (nestedLevel + 1)) {
rbStack.add(new RecordBuilder());
}
@@ -157,7 +157,7 @@
private void addKeptFieldToSubRecord(ARecordType requiredType, IVisitablePointable fieldNamePointable,
IVisitablePointable fieldValuePointable, IVisitablePointable fieldTypePointable,
AListVisitablePointable inputList, int nestedLevel)
- throws IOException, AsterixException, HyracksDataException {
+ throws IOException {
runtimeRecordTypeInfo.reset(requiredType);
int pos = runtimeRecordTypeInfo.getFieldIndex(fieldNamePointable.getByteArray(),
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
index 5acbeb9..f3eb6c9 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
@@ -158,6 +158,7 @@
import org.apache.asterix.runtime.evaluators.functions.FullTextContainsDescriptor;
import org.apache.asterix.runtime.evaluators.functions.FullTextContainsWithoutOptionDescriptor;
import org.apache.asterix.runtime.evaluators.functions.GetItemDescriptor;
+import org.apache.asterix.runtime.evaluators.functions.GetJobParameterByNameDescriptor;
import org.apache.asterix.runtime.evaluators.functions.GramTokensDescriptor;
import org.apache.asterix.runtime.evaluators.functions.HashedGramTokensDescriptor;
import org.apache.asterix.runtime.evaluators.functions.HashedWordTokensDescriptor;
@@ -437,6 +438,9 @@
// Inject failure function
fc.add(InjectFailureDescriptor.FACTORY);
+ // Get Job Parameter function
+ fc.add(GetJobParameterByNameDescriptor.FACTORY);
+
// Switch case
fc.add(SwitchCaseDescriptor.FACTORY);
@@ -737,8 +741,8 @@
*/
private static IFunctionDescriptorFactory getGeneratedFunctionDescriptorFactory(Class<?> cl) {
try {
- String className = CodeGenHelper.getGeneratedClassName(cl.getName(),
- CodeGenHelper.DEFAULT_SUFFIX_FOR_GENERATED_CLASS);
+ String className =
+ CodeGenHelper.getGeneratedClassName(cl.getName(), CodeGenHelper.DEFAULT_SUFFIX_FOR_GENERATED_CLASS);
Class<?> generatedCl = cl.getClassLoader().loadClass(className);
Field factory = generatedCl.getDeclaredField(FACTORY);
return (IFunctionDescriptorFactory) factory.get(null);
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
index 2749b5a..d3c3fe7 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/JobEventListenerFactory.java
@@ -18,30 +18,58 @@
*/
package org.apache.asterix.runtime.job.listener;
+import static org.apache.asterix.common.transactions.ITransactionManager.AtomicityLevel;
+
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.api.INcApplicationContext;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionManager;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.api.context.IHyracksJobletContext;
import org.apache.hyracks.api.job.IJobletEventListener;
import org.apache.hyracks.api.job.IJobletEventListenerFactory;
+import org.apache.hyracks.api.job.JobParameterByteStore;
import org.apache.hyracks.api.job.JobStatus;
-public class JobEventListenerFactory implements IJobletEventListenerFactory {
+public class JobEventListenerFactory implements IJobEventListenerFactory {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
+
+ private TxnId txnId;
private final boolean transactionalWrite;
- public JobEventListenerFactory(JobId jobId, boolean transactionalWrite) {
- this.jobId = jobId;
+ //To enable new Asterix TxnId for separate deployed job spec invocations
+ private static final byte[] TRANSACTION_ID_PARAMETER_NAME = "TxnIdParameter".getBytes();
+
+ public JobEventListenerFactory(TxnId txnId, boolean transactionalWrite) {
+ this.txnId = txnId;
this.transactionalWrite = transactionalWrite;
}
- public JobId getJobId() {
- return jobId;
+ public TxnId getTxnId() {
+ return txnId;
+ }
+
+ @Override
+ public TxnId getTxnId(TxnId compiledTxnId) {
+ return txnId;
+ }
+
+ @Override
+ public IJobletEventListenerFactory copyFactory() {
+ return new JobEventListenerFactory(txnId, transactionalWrite);
+ }
+
+ @Override
+ public void updateListenerJobParameters(JobParameterByteStore jobParameterByteStore) {
+ String AsterixTransactionIdString =
+ new String(jobParameterByteStore.getParameterValue(TRANSACTION_ID_PARAMETER_NAME, 0,
+ TRANSACTION_ID_PARAMETER_NAME.length));
+ if (AsterixTransactionIdString.length() > 0) {
+ this.txnId = new TxnId(Integer.parseInt(AsterixTransactionIdString));
+ }
}
@Override
@@ -53,10 +81,13 @@
try {
ITransactionManager txnManager = ((INcApplicationContext) jobletContext.getServiceContext()
.getApplicationContext()).getTransactionSubsystem().getTransactionManager();
- ITransactionContext txnContext = txnManager.getTransactionContext(jobId, false);
+ ITransactionContext txnContext = txnManager.getTransactionContext(txnId);
txnContext.setWriteTxn(transactionalWrite);
- txnManager.completedTransaction(txnContext, DatasetId.NULL, -1,
- !(jobStatus == JobStatus.FAILURE));
+ if (jobStatus != JobStatus.FAILURE) {
+ txnManager.commitTransaction(txnId);
+ } else {
+ txnManager.abortTransaction(txnId);
+ }
} catch (ACIDException e) {
throw new Error(e);
}
@@ -65,8 +96,9 @@
@Override
public void jobletStart() {
try {
+ TransactionOptions options = new TransactionOptions(AtomicityLevel.ENTITY_LEVEL);
((INcApplicationContext) jobletContext.getServiceContext().getApplicationContext())
- .getTransactionSubsystem().getTransactionManager().getTransactionContext(jobId, true);
+ .getTransactionSubsystem().getTransactionManager().beginTransaction(txnId, options);
} catch (ACIDException e) {
throw new Error(e);
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
index f41f326..bfe1925 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/job/listener/MultiTransactionJobletEventListenerFactory.java
@@ -20,32 +20,50 @@
import java.util.List;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.api.INcApplicationContext;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionManager;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.api.context.IHyracksJobletContext;
import org.apache.hyracks.api.job.IJobletEventListener;
import org.apache.hyracks.api.job.IJobletEventListenerFactory;
+import org.apache.hyracks.api.job.JobParameterByteStore;
import org.apache.hyracks.api.job.JobStatus;
/**
* This Joblet enable transactions on multiple datasets to take place in the same Hyracks Job
* It takes a list of Transaction job ids instead of a single job Id
*/
-public class MultiTransactionJobletEventListenerFactory implements IJobletEventListenerFactory {
+public class MultiTransactionJobletEventListenerFactory implements IJobEventListenerFactory {
private static final long serialVersionUID = 1L;
- private final List<JobId> jobIds;
+ private final List<TxnId> txnIds;
private final boolean transactionalWrite;
- public MultiTransactionJobletEventListenerFactory(List<JobId> jobIds, boolean transactionalWrite) {
- this.jobIds = jobIds;
+ public MultiTransactionJobletEventListenerFactory(List<TxnId> txnIds, boolean transactionalWrite) {
+ this.txnIds = txnIds;
this.transactionalWrite = transactionalWrite;
}
+ //TODO: Enable this factory to be usable for Deployed Jobs
+ @Override
+ public TxnId getTxnId(TxnId compiledTxnId) {
+ return compiledTxnId;
+ }
+
+ @Override
+ public IJobletEventListenerFactory copyFactory() {
+ return new MultiTransactionJobletEventListenerFactory(txnIds, transactionalWrite);
+ }
+
+ @Override
+ public void updateListenerJobParameters(JobParameterByteStore jobParameterByteStore) {
+ //no op
+ }
+
@Override
public IJobletEventListener createListener(final IHyracksJobletContext jobletContext) {
@@ -56,11 +74,14 @@
ITransactionManager txnManager =
((INcApplicationContext) jobletContext.getServiceContext().getApplicationContext())
.getTransactionSubsystem().getTransactionManager();
- for (JobId jobId : jobIds) {
- ITransactionContext txnContext = txnManager.getTransactionContext(jobId, false);
+ for (TxnId txnId : txnIds) {
+ ITransactionContext txnContext = txnManager.getTransactionContext(txnId);
txnContext.setWriteTxn(transactionalWrite);
- txnManager.completedTransaction(txnContext, DatasetId.NULL, -1,
- !(jobStatus == JobStatus.FAILURE));
+ if (jobStatus != JobStatus.FAILURE) {
+ txnManager.commitTransaction(txnId);
+ } else {
+ txnManager.abortTransaction(txnId);
+ }
}
} catch (ACIDException e) {
throw new Error(e);
@@ -70,9 +91,11 @@
@Override
public void jobletStart() {
try {
- for (JobId jobId : jobIds) {
+ TransactionOptions options =
+ new TransactionOptions(ITransactionManager.AtomicityLevel.ENTITY_LEVEL);
+ for (TxnId txnId : txnIds) {
((INcApplicationContext) jobletContext.getServiceContext().getApplicationContext())
- .getTransactionSubsystem().getTransactionManager().getTransactionContext(jobId, true);
+ .getTransactionSubsystem().getTransactionManager().beginTransaction(txnId, options);
}
} catch (ACIDException e) {
throw new Error(e);
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportLocalCountersMessage.java
similarity index 76%
rename from asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java
rename to asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportLocalCountersMessage.java
index 277c0ba..3f8ced8 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportLocalCountersMessage.java
@@ -27,27 +27,27 @@
import org.apache.asterix.common.messaging.api.INCMessageBroker;
import org.apache.asterix.common.metadata.MetadataIndexImmutableProperties;
import org.apache.asterix.common.transactions.IResourceIdManager;
+import org.apache.asterix.transaction.management.service.transaction.TxnIdFactory;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.control.nc.NodeControllerService;
-public class ReportMaxResourceIdMessage implements ICcAddressedMessage {
+public class ReportLocalCountersMessage implements ICcAddressedMessage {
private static final long serialVersionUID = 1L;
- private static final Logger LOGGER = Logger.getLogger(ReportMaxResourceIdMessage.class.getName());
+ private static final Logger LOGGER = Logger.getLogger(ReportLocalCountersMessage.class.getName());
private final long maxResourceId;
+ private final long maxTxnId;
private final String src;
- public ReportMaxResourceIdMessage(String src, long maxResourceId) {
+ public ReportLocalCountersMessage(String src, long maxResourceId, long maxTxnId) {
this.src = src;
this.maxResourceId = maxResourceId;
- }
-
- public long getMaxResourceId() {
- return maxResourceId;
+ this.maxTxnId = maxTxnId;
}
@Override
public void handle(ICcApplicationContext appCtx) throws HyracksDataException, InterruptedException {
IResourceIdManager resourceIdManager = appCtx.getResourceIdManager();
+ TxnIdFactory.ensureMinimumId(maxTxnId);
resourceIdManager.report(src, maxResourceId);
}
@@ -56,17 +56,19 @@
INcApplicationContext appContext = (INcApplicationContext) ncs.getApplicationContext();
long maxResourceId = Math.max(appContext.getLocalResourceRepository().maxId(),
MetadataIndexImmutableProperties.FIRST_AVAILABLE_USER_DATASET_ID);
- ReportMaxResourceIdMessage maxResourceIdMsg = new ReportMaxResourceIdMessage(ncs.getId(), maxResourceId);
+ long maxTxnId = appContext.getTransactionSubsystem().getTransactionManager().getMaxTxnId();
+ ReportLocalCountersMessage countersMessage =
+ new ReportLocalCountersMessage(ncs.getId(), maxResourceId, maxTxnId);
try {
- ((INCMessageBroker) ncs.getContext().getMessageBroker()).sendMessageToCC(maxResourceIdMsg);
+ ((INCMessageBroker) ncs.getContext().getMessageBroker()).sendMessageToCC(countersMessage);
} catch (Exception e) {
- LOGGER.log(Level.SEVERE, "Unable to report max local resource id", e);
+ LOGGER.log(Level.SEVERE, "Unable to report local counters", e);
throw HyracksDataException.create(e);
}
}
@Override
public String toString() {
- return ReportMaxResourceIdMessage.class.getSimpleName();
+ return ReportLocalCountersMessage.class.getSimpleName();
}
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdRequestMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportLocalCountersRequestMessage.java
similarity index 87%
rename from asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdRequestMessage.java
rename to asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportLocalCountersRequestMessage.java
index a43376d..785ad2f 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportMaxResourceIdRequestMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ReportLocalCountersRequestMessage.java
@@ -23,16 +23,16 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.control.nc.NodeControllerService;
-public class ReportMaxResourceIdRequestMessage implements INcAddressedMessage {
+public class ReportLocalCountersRequestMessage implements INcAddressedMessage {
private static final long serialVersionUID = 1L;
@Override
public void handle(INcApplicationContext appCtx) throws HyracksDataException, InterruptedException {
- ReportMaxResourceIdMessage.send((NodeControllerService) appCtx.getServiceContext().getControllerService());
+ ReportLocalCountersMessage.send((NodeControllerService) appCtx.getServiceContext().getControllerService());
}
@Override
public String toString() {
- return ReportMaxResourceIdRequestMessage.class.getSimpleName();
+ return ReportLocalCountersRequestMessage.class.getSimpleName();
}
}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
index decc1a9..a2f4aa1 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/message/ResourceIdRequestMessage.java
@@ -61,7 +61,7 @@
private void requestMaxResourceID(IClusterStateManager clusterStateManager, IResourceIdManager resourceIdManager,
ICCMessageBroker broker) throws Exception {
Set<String> getParticipantNodes = clusterStateManager.getParticipantNodes();
- ReportMaxResourceIdRequestMessage msg = new ReportMaxResourceIdRequestMessage();
+ ReportLocalCountersRequestMessage msg = new ReportLocalCountersRequestMessage();
for (String nodeId : getParticipantNodes) {
if (!resourceIdManager.reported(nodeId)) {
broker.sendApplicationMessageToNC(msg, nodeId);
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMIndexBulkLoadOperatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMIndexBulkLoadOperatorDescriptor.java
new file mode 100644
index 0000000..74590c7
--- /dev/null
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMIndexBulkLoadOperatorDescriptor.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.asterix.runtime.operators;
+
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
+import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider;
+import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IOperatorDescriptorRegistry;
+import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.dataflow.TreeIndexBulkLoadOperatorDescriptor;
+
+public class LSMIndexBulkLoadOperatorDescriptor extends TreeIndexBulkLoadOperatorDescriptor {
+
+ private static final long serialVersionUID = 1L;
+
+ public enum BulkLoadUsage {
+ LOAD,
+ CREATE_INDEX
+ }
+
+ protected final IIndexDataflowHelperFactory primaryIndexHelperFactory;
+
+ protected final BulkLoadUsage usage;
+
+ protected final int datasetId;
+
+ public LSMIndexBulkLoadOperatorDescriptor(IOperatorDescriptorRegistry spec, RecordDescriptor outRecDesc,
+ int[] fieldPermutation, float fillFactor, boolean verifyInput, long numElementsHint,
+ boolean checkIfEmptyIndex, IIndexDataflowHelperFactory indexHelperFactory,
+ IIndexDataflowHelperFactory primaryIndexHelperFactory, BulkLoadUsage usage, int datasetId) {
+ super(spec, outRecDesc, fieldPermutation, fillFactor, verifyInput, numElementsHint, checkIfEmptyIndex,
+ indexHelperFactory);
+ this.primaryIndexHelperFactory = primaryIndexHelperFactory;
+ this.usage = usage;
+ this.datasetId = datasetId;
+ }
+
+ @Override
+ public IOperatorNodePushable createPushRuntime(IHyracksTaskContext ctx,
+ IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) throws HyracksDataException {
+ return new LSMIndexBulkLoadOperatorNodePushable(indexHelperFactory, primaryIndexHelperFactory, ctx, partition,
+ fieldPermutation, fillFactor, verifyInput, numElementsHint, checkIfEmptyIndex,
+ recordDescProvider.getInputRecordDescriptor(this.getActivityId(), 0), usage, datasetId);
+ }
+}
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMIndexBulkLoadOperatorNodePushable.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMIndexBulkLoadOperatorNodePushable.java
new file mode 100644
index 0000000..2415556
--- /dev/null
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMIndexBulkLoadOperatorNodePushable.java
@@ -0,0 +1,111 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.runtime.operators;
+
+import java.util.List;
+
+import org.apache.asterix.common.api.IDatasetLifecycleManager;
+import org.apache.asterix.common.api.INcApplicationContext;
+import org.apache.asterix.runtime.operators.LSMIndexBulkLoadOperatorDescriptor.BulkLoadUsage;
+import org.apache.hyracks.api.context.IHyracksTaskContext;
+import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
+import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.dataflow.IndexBulkLoadOperatorNodePushable;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMIndexDiskComponentBulkLoader;
+import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
+
+public class LSMIndexBulkLoadOperatorNodePushable extends IndexBulkLoadOperatorNodePushable {
+ protected final BulkLoadUsage usage;
+
+ protected final IIndexDataflowHelper primaryIndexHelper;
+ protected final IDatasetLifecycleManager datasetManager;
+ protected final int datasetId;
+ protected final int partition;
+
+ protected ILSMIndex primaryIndex;
+
+ public LSMIndexBulkLoadOperatorNodePushable(IIndexDataflowHelperFactory indexDataflowHelperFactory,
+ IIndexDataflowHelperFactory priamryIndexDataflowHelperFactory, IHyracksTaskContext ctx, int partition,
+ int[] fieldPermutation, float fillFactor, boolean verifyInput, long numElementsHint,
+ boolean checkIfEmptyIndex, RecordDescriptor recDesc, BulkLoadUsage usage, int datasetId)
+ throws HyracksDataException {
+ super(indexDataflowHelperFactory, ctx, partition, fieldPermutation, fillFactor, verifyInput, numElementsHint,
+ checkIfEmptyIndex, recDesc);
+
+ if (priamryIndexDataflowHelperFactory != null) {
+ this.primaryIndexHelper =
+ priamryIndexDataflowHelperFactory.create(ctx.getJobletContext().getServiceContext(), partition);
+ } else {
+ this.primaryIndexHelper = null;
+ }
+ this.usage = usage;
+ this.datasetId = datasetId;
+ this.partition = partition;
+ INcApplicationContext ncCtx =
+ (INcApplicationContext) ctx.getJobletContext().getServiceContext().getApplicationContext();
+ datasetManager = ncCtx.getDatasetLifecycleManager();
+ }
+
+ @Override
+ protected void initializeBulkLoader() throws HyracksDataException {
+ ILSMIndex targetIndex = (ILSMIndex) index;
+ if (usage.equals(BulkLoadUsage.LOAD)) {
+ // for a loaded dataset, we use the default Id 0 which is guaranteed to be smaller
+ // than Ids of all memory components
+
+ // TODO handle component Id for datasets loaded multiple times
+ // TODO move this piece of code to io operation callback
+ bulkLoader = targetIndex.createBulkLoader(fillFactor, verifyInput, numElementsHint, checkIfEmptyIndex);
+ ILSMDiskComponent diskComponent = ((LSMIndexDiskComponentBulkLoader) bulkLoader).getComponent();
+ LSMComponentIdUtils.persist(LSMComponentId.DEFAULT_COMPONENT_ID, diskComponent.getMetadata());
+ } else {
+ primaryIndexHelper.open();
+ primaryIndex = (ILSMIndex) primaryIndexHelper.getIndexInstance();
+ List<ILSMDiskComponent> primaryComponents = primaryIndex.getDiskComponents();
+ bulkLoader = targetIndex.createBulkLoader(fillFactor, verifyInput, numElementsHint, checkIfEmptyIndex);
+ if (!primaryComponents.isEmpty()) {
+ // TODO move this piece of code to io operation callback
+ // Ideally, this should be done in io operation callback when a bulk load operation is finished
+ // However, currently we don't have an extensible callback mechanism to support this
+ ILSMComponentId bulkloadId = LSMComponentIdUtils.union(primaryComponents.get(0).getId(),
+ primaryComponents.get(primaryComponents.size() - 1).getId());
+ ILSMDiskComponent diskComponent = ((LSMIndexDiskComponentBulkLoader) bulkLoader).getComponent();
+ LSMComponentIdUtils.persist(bulkloadId, diskComponent.getMetadata());
+ }
+ }
+ }
+
+ @Override
+ public void close() throws HyracksDataException {
+ try {
+ super.close();
+ } finally {
+ if (primaryIndex != null) {
+ primaryIndexHelper.close();
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
index 1f41c82..4855a27 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMPrimaryUpsertOperatorNodePushable.java
@@ -55,6 +55,7 @@
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.IFrameOperationCallback;
@@ -64,6 +65,7 @@
import org.apache.hyracks.storage.am.lsm.common.dataflow.LSMIndexInsertUpdateDeleteOperatorNodePushable;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMTreeIndexAccessor;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.MultiComparator;
@@ -96,6 +98,7 @@
private final ISearchOperationCallbackFactory searchCallbackFactory;
private final IFrameTupleProcessor processor;
private LSMTreeIndexAccessor lsmAccessor;
+ private IIndexAccessParameters iap;
public LSMPrimaryUpsertOperatorNodePushable(IHyracksTaskContext ctx, int partition,
IIndexDataflowHelperFactory indexHelperFactory, int[] fieldPermutation, RecordDescriptor inputRecDesc,
@@ -218,7 +221,8 @@
abstractModCallback = (AbstractIndexModificationOperationCallback) modCallback;
searchCallback = (LockThenSearchOperationCallback) searchCallbackFactory
.createSearchOperationCallback(indexHelper.getResource().getId(), ctx, this);
- indexAccessor = index.createAccessor(abstractModCallback, searchCallback);
+ iap = new IndexAccessParameters(abstractModCallback, searchCallback);
+ indexAccessor = index.createAccessor(iap);
lsmAccessor = (LSMTreeIndexAccessor) indexAccessor;
cursor = indexAccessor.createSearchCursor(false);
frameTuple = new FrameTupleReference();
@@ -326,7 +330,7 @@
appender.write(writer, true);
}
- private void appendFilterToPrevTuple() throws IOException, AsterixException {
+ private void appendFilterToPrevTuple() throws IOException {
if (isFiltered) {
prevRecWithPKWithFilterValue.reset();
for (int i = 0; i < prevTuple.getFieldCount(); i++) {
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMSecondaryIndexBulkLoadNodePushable.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMSecondaryIndexBulkLoadNodePushable.java
index cb81b64..6d9ec47 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMSecondaryIndexBulkLoadNodePushable.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/LSMSecondaryIndexBulkLoadNodePushable.java
@@ -19,24 +19,20 @@
package org.apache.asterix.runtime.operators;
import java.nio.ByteBuffer;
-import java.util.List;
import org.apache.asterix.runtime.operators.LSMSecondaryIndexCreationTupleProcessorNodePushable.DeletedTupleCounter;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.data.std.primitive.LongPointable;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
import org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentBulkLoader;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
-import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMIndexDiskComponentBulkLoader;
+import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
/**
* This operator node is used to bulk load incoming tuples (scanned from the primary index)
@@ -56,12 +52,9 @@
private ILSMIndex primaryIndex;
private ILSMIndex secondaryIndex;
- private ILSMDiskComponent component;
- private ILSMDiskComponentBulkLoader componentBulkLoader;
+ private LSMIndexDiskComponentBulkLoader componentBulkLoader;
private int currentComponentPos = -1;
- private ILSMDiskComponent[] diskComponents;
-
public LSMSecondaryIndexBulkLoadNodePushable(IHyracksTaskContext ctx, int partition, RecordDescriptor inputRecDesc,
IIndexDataflowHelperFactory primaryIndexHelperFactory,
IIndexDataflowHelperFactory secondaryIndexHelperFactory, int[] fieldPermutation, int numTagFields,
@@ -92,7 +85,6 @@
super.open();
primaryIndexHelper.open();
primaryIndex = (ILSMIndex) primaryIndexHelper.getIndexInstance();
- diskComponents = new ILSMDiskComponent[primaryIndex.getDiskComponents().size()];
secondaryIndexHelper.open();
secondaryIndex = (ILSMIndex) secondaryIndexHelper.getIndexInstance();
@@ -107,8 +99,6 @@
closeException = e;
}
- activateComponents();
-
try {
if (primaryIndexHelper != null) {
primaryIndexHelper.close();
@@ -184,24 +174,22 @@
}
private void endCurrentComponent() throws HyracksDataException {
- if (component != null) {
- // set disk component id
-
+ if (componentBulkLoader != null) {
componentBulkLoader.end();
- diskComponents[currentComponentPos] = component;
-
componentBulkLoader = null;
- component = null;
}
}
private void loadNewComponent(int componentPos) throws HyracksDataException {
endCurrentComponent();
- component = secondaryIndex.createBulkLoadTarget();
int numTuples = getNumDeletedTuples(componentPos);
- componentBulkLoader = component.createBulkLoader(1.0f, false, numTuples, false, true, true);
-
+ ILSMDiskComponent primaryComponent = primaryIndex.getDiskComponents().get(componentPos);
+ componentBulkLoader =
+ (LSMIndexDiskComponentBulkLoader) secondaryIndex.createBulkLoader(1.0f, false, numTuples, false);
+ ILSMDiskComponent diskComponent = componentBulkLoader.getComponent();
+ // TODO move this piece of code to io operation callback
+ LSMComponentIdUtils.persist(primaryComponent.getId(), diskComponent.getMetadata());
}
private void addAntiMatterTuple(ITupleReference tuple) throws HyracksDataException {
@@ -220,29 +208,6 @@
}
- private void activateComponents() throws HyracksDataException {
- List<ILSMDiskComponent> primaryComponents = primaryIndex.getDiskComponents();
- for (int i = diskComponents.length - 1; i >= 0; i--) {
- // start from the oldest component to the newest component
- if (diskComponents[i] != null && diskComponents[i].getComponentSize() > 0) {
- secondaryIndex.getIOOperationCallback().afterOperation(LSMOperationType.FLUSH, null, diskComponents[i]);
-
- // setting component id has to be place between afterOperation and addBulkLoadedComponent,
- // since afterOperation would set a flush component id (but it's not invalid)
- // and addBulkLoadedComponent would finalize the component
- ILSMDiskComponentId primaryComponentId = primaryComponents.get(i).getComponentId();
- //set component id
- diskComponents[i].getMetadata().put(ILSMDiskComponentId.COMPONENT_ID_MIN_KEY,
- LongPointable.FACTORY.createPointable(primaryComponentId.getMinId()));
- diskComponents[i].getMetadata().put(ILSMDiskComponentId.COMPONENT_ID_MAX_KEY,
- LongPointable.FACTORY.createPointable(primaryComponentId.getMaxId()));
-
- ((AbstractLSMIndex) secondaryIndex).getLsmHarness().addBulkLoadedComponent(diskComponents[i]);
-
- }
- }
- }
-
private int getNumDeletedTuples(int componentPos) {
DeletedTupleCounter counter = (DeletedTupleCounter) ctx.getStateObject(partition);
return counter.get(componentPos);
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
index f2deb74..d61e9a0 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/operators/std/FlushDatasetOperatorDescriptor.java
@@ -28,7 +28,7 @@
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionManager;
import org.apache.asterix.common.transactions.ImmutableDatasetId;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.transaction.management.service.transaction.TransactionManagementConstants.LockManagerConstants.LockMode;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
@@ -40,12 +40,12 @@
public class FlushDatasetOperatorDescriptor extends AbstractSingleActivityOperatorDescriptor {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
+ private final TxnId txnId;
private final DatasetId datasetId;
- public FlushDatasetOperatorDescriptor(IOperatorDescriptorRegistry spec, JobId jobId, int datasetId) {
+ public FlushDatasetOperatorDescriptor(IOperatorDescriptorRegistry spec, TxnId txnId, int datasetId) {
super(spec, 1, 0);
- this.jobId = jobId;
+ this.txnId = txnId;
this.datasetId = new ImmutableDatasetId(datasetId);
}
@@ -78,7 +78,7 @@
ILockManager lockManager = appCtx.getTransactionSubsystem().getLockManager();
ITransactionManager txnManager = appCtx.getTransactionSubsystem().getTransactionManager();
// get the local transaction
- ITransactionContext txnCtx = txnManager.getTransactionContext(jobId, false);
+ ITransactionContext txnCtx = txnManager.getTransactionContext(txnId);
// lock the dataset granule
lockManager.lock(datasetId, -1, LockMode.S, txnCtx);
// flush the dataset synchronously
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java
index 855031e..0bd8b9e 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/CcApplicationContext.java
@@ -44,6 +44,7 @@
import org.apache.asterix.common.replication.IFaultToleranceStrategy;
import org.apache.asterix.common.transactions.IResourceIdManager;
import org.apache.asterix.runtime.transaction.ResourceIdManager;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.application.ICCServiceContext;
import org.apache.hyracks.api.client.HyracksConnection;
import org.apache.hyracks.api.client.IHyracksClientConnection;
@@ -86,7 +87,7 @@
ILibraryManager libraryManager, Supplier<IMetadataBootstrap> metadataBootstrapSupplier,
IGlobalRecoveryManager globalRecoveryManager, IFaultToleranceStrategy ftStrategy,
IJobLifecycleListener activeLifeCycleListener, IStorageComponentProvider storageComponentProvider,
- IMetadataLockManager mdLockManager) throws AsterixException, IOException {
+ IMetadataLockManager mdLockManager) throws AlgebricksException, IOException {
this.ccServiceCtx = ccServiceCtx;
this.hcc = hcc;
this.libraryManager = libraryManager;
diff --git a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
index ac83b71..10926e0 100644
--- a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
+++ b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/utils/ClusterStateManager.java
@@ -44,6 +44,7 @@
import org.apache.asterix.event.schema.cluster.Cluster;
import org.apache.asterix.event.schema.cluster.Node;
import org.apache.hyracks.algebricks.common.constraints.AlgebricksAbsolutePartitionConstraint;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.api.config.IOption;
import org.apache.hyracks.api.config.Section;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -396,7 +397,7 @@
@Override
public synchronized void registerNodePartitions(String nodeId, ClusterPartition[] nodePartitions)
- throws AsterixException {
+ throws AlgebricksException {
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Registering node partitions for node " + nodeId + ": " + Arrays.toString(nodePartitions));
}
diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java
index 3b2d0ce..09a898a 100644
--- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java
+++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/datagen/AdmDataGen.java
@@ -46,9 +46,7 @@
import org.apache.asterix.common.annotations.TypeDataGen;
import org.apache.asterix.common.annotations.UndeclaredFieldsDataGen;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.exceptions.MetadataException;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.lang.aql.parser.AQLParserFactory;
import org.apache.asterix.lang.aql.parser.ParseException;
import org.apache.asterix.lang.common.base.IParser;
@@ -727,8 +725,8 @@
"list-val-file annotation cannot be used for field of type " + ti.getTypeTag());
}
AbstractCollectionType act = (AbstractCollectionType) ti;
- declaredFieldsGenerators[i] = new ListFromArrayGenerator(act, a, lvf.getMin(),
- lvf.getMax());
+ declaredFieldsGenerators[i] =
+ new ListFromArrayGenerator(act, a, lvf.getMin(), lvf.getMax());
break;
}
case VALFILESAMEINDEX: {
@@ -774,9 +772,9 @@
}
switch (fi.getValueType()) {
case INT: {
- declaredFieldsGenerators[i] = new IntIntervalGenerator(
- Integer.parseInt(fi.getMin()), Integer.parseInt(fi.getMax()), prefix,
- suffix);
+ declaredFieldsGenerators[i] =
+ new IntIntervalGenerator(Integer.parseInt(fi.getMin()),
+ Integer.parseInt(fi.getMax()), prefix, suffix);
break;
}
case LONG: {
@@ -785,9 +783,9 @@
break;
}
case DOUBLE: {
- declaredFieldsGenerators[i] = new DoubleIntervalGenerator(
- Double.parseDouble(fi.getMin()), Double.parseDouble(fi.getMax()), prefix,
- suffix);
+ declaredFieldsGenerators[i] =
+ new DoubleIntervalGenerator(Double.parseDouble(fi.getMin()),
+ Double.parseDouble(fi.getMax()), prefix, suffix);
break;
}
default: {
@@ -813,14 +811,14 @@
}
case DATEBETWEENYEARS: {
DateBetweenYearsDataGen dby = (DateBetweenYearsDataGen) rfdg;
- declaredFieldsGenerators[i] = new DateBetweenYearsGenerator(dby.getMinYear(),
- dby.getMaxYear());
+ declaredFieldsGenerators[i] =
+ new DateBetweenYearsGenerator(dby.getMinYear(), dby.getMaxYear());
break;
}
case DATETIMEBETWEENYEARS: {
DatetimeBetweenYearsDataGen dtby = (DatetimeBetweenYearsDataGen) rfdg;
- declaredFieldsGenerators[i] = new DatetimeBetweenYearsGenerator(dtby.getMinYear(),
- dtby.getMaxYear());
+ declaredFieldsGenerators[i] =
+ new DatetimeBetweenYearsGenerator(dtby.getMinYear(), dtby.getMaxYear());
break;
}
case DATETIMEADDRANDHOURS: {
@@ -842,21 +840,21 @@
throw new Exception("Couldn't find field " + dtarh.getAddToField() + " before field "
+ recType.getFieldNames()[i]);
}
- declaredFieldsGenerators[i] = new DatetimeAddRandHoursGenerator(dtarh.getMinHour(),
- dtarh.getMaxHour(), adtg);
+ declaredFieldsGenerators[i] =
+ new DatetimeAddRandHoursGenerator(dtarh.getMinHour(), dtarh.getMaxHour(), adtg);
break;
}
case AUTO: {
AutoDataGen auto = (AutoDataGen) rfdg;
switch (ti.getTypeTag()) {
case INTEGER: {
- declaredFieldsGenerators[i] = new IntAutoGenerator(
- Integer.parseInt(auto.getInitValueStr()));
+ declaredFieldsGenerators[i] =
+ new IntAutoGenerator(Integer.parseInt(auto.getInitValueStr()));
break;
}
case BIGINT: {
- declaredFieldsGenerators[i] = new LongAutoGenerator(
- Long.parseLong(auto.getInitValueStr()));
+ declaredFieldsGenerators[i] =
+ new LongAutoGenerator(Long.parseLong(auto.getInitValueStr()));
break;
}
default: {
@@ -881,9 +879,9 @@
if (!recType.isOpen()) {
throw new Exception("Cannot generate undeclared fields for closed type " + recType);
}
- undeclaredFieldsGenerator = new GenFieldsIntGenerator(declaredFieldsGenerators.length,
- ufdg.getMinUndeclaredFields(), ufdg.getMaxUndeclaredFields(),
- ufdg.getUndeclaredFieldsPrefix());
+ undeclaredFieldsGenerator =
+ new GenFieldsIntGenerator(declaredFieldsGenerators.length, ufdg.getMinUndeclaredFields(),
+ ufdg.getMaxUndeclaredFields(), ufdg.getUndeclaredFieldsPrefix());
}
}
if (undeclaredFieldsGenerator != null) {
@@ -937,14 +935,13 @@
this.outputDir = outputDir;
}
- public void init() throws IOException, ParseException, AsterixException, ACIDException, MetadataException,
- AlgebricksException {
+ public void init() throws IOException, ParseException, ACIDException, AlgebricksException {
FileReader aql = new FileReader(schemaFile);
IParser parser = parserFactory.createParser(aql);
List<Statement> statements = parser.parse();
aql.close();
// TODO: Need to fix how to use transactions here.
- MetadataTransactionContext mdTxnCtx = new MetadataTransactionContext(new JobId(-1));
+ MetadataTransactionContext mdTxnCtx = new MetadataTransactionContext(new TxnId(-1));
ADGenDmlTranslator dmlt = new ADGenDmlTranslator(mdTxnCtx, statements);
dmlt.translate();
typeMap = dmlt.getTypeMap();
diff --git a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
index 94389b2..c6095bd 100644
--- a/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
+++ b/asterixdb/asterix-tools/src/test/java/org/apache/asterix/tools/translator/ADGenDmlTranslator.java
@@ -23,8 +23,6 @@
import java.util.Map;
import org.apache.asterix.common.annotations.TypeDataGen;
-import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.exceptions.MetadataException;
import org.apache.asterix.lang.common.base.Statement;
import org.apache.asterix.lang.common.statement.DataverseDecl;
import org.apache.asterix.lang.common.statement.TypeDecl;
@@ -47,10 +45,10 @@
this.aqlStatements = aqlStatements;
}
- public void translate() throws AsterixException, MetadataException, AlgebricksException {
+ public void translate() throws AlgebricksException {
String defaultDataverse = getDefaultDataverse();
- types = new HashMap<TypeSignature, IAType>();
- typeDataGenMap = new HashMap<TypeSignature, TypeDataGen>();
+ types = new HashMap<>();
+ typeDataGenMap = new HashMap<>();
for (Statement stmt : aqlStatements) {
if (stmt.getKind() == Statement.Kind.TYPE_DECL) {
diff --git a/asterixdb/asterix-transactions/pom.xml b/asterixdb/asterix-transactions/pom.xml
index 5c067e7..b7e1871 100644
--- a/asterixdb/asterix-transactions/pom.xml
+++ b/asterixdb/asterix-transactions/pom.xml
@@ -145,6 +145,10 @@
</dependency>
<dependency>
<groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.hyracks</groupId>
<artifactId>algebricks-runtime</artifactId>
</dependency>
</dependencies>
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/AbstractIndexModificationOperationCallback.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/AbstractIndexModificationOperationCallback.java
index 1acc235..3da9e83 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/AbstractIndexModificationOperationCallback.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/AbstractIndexModificationOperationCallback.java
@@ -68,7 +68,6 @@
}
}
- protected final long resourceId;
protected final byte resourceType;
protected final Operation indexOp;
protected final ITransactionSubsystem txnSubsystem;
@@ -77,15 +76,14 @@
protected AbstractIndexModificationOperationCallback(DatasetId datasetId, int[] primaryKeyFields,
ITransactionContext txnCtx, ILockManager lockManager, ITransactionSubsystem txnSubsystem, long resourceId,
int resourcePartition, byte resourceType, Operation indexOp) {
- super(datasetId, primaryKeyFields, txnCtx, lockManager);
- this.resourceId = resourceId;
+ super(datasetId, resourceId, primaryKeyFields, txnCtx, lockManager);
this.resourceType = resourceType;
this.indexOp = indexOp;
this.txnSubsystem = txnSubsystem;
logRecord = new LogRecord();
logRecord.setTxnCtx(txnCtx);
logRecord.setLogType(LogType.UPDATE);
- logRecord.setJobId(txnCtx.getJobId().getId());
+ logRecord.setTxnId(txnCtx.getTxnId().getId());
logRecord.setDatasetId(datasetId.getId());
logRecord.setResourceId(resourceId);
logRecord.setResourcePartition(resourcePartition);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallback.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallback.java
index f76cb89..fe17b39 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallback.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallback.java
@@ -45,17 +45,17 @@
private final ILogRecord logRecord;
private int pkHash;
- public LockThenSearchOperationCallback(DatasetId datasetId, int[] entityIdFields,
+ public LockThenSearchOperationCallback(DatasetId datasetId, long resourceId, int[] entityIdFields,
ITransactionSubsystem txnSubsystem, ITransactionContext txnCtx,
IOperatorNodePushable operatorNodePushable) {
- super(datasetId, entityIdFields, txnCtx, txnSubsystem.getLockManager());
+ super(datasetId, resourceId, entityIdFields, txnCtx, txnSubsystem.getLockManager());
this.operatorNodePushable = (LSMIndexInsertUpdateDeleteOperatorNodePushable) operatorNodePushable;
this.logManager = txnSubsystem.getLogManager();
this.logRecord = new LogRecord();
logRecord.setTxnCtx(txnCtx);
logRecord.setLogSource(LogSource.LOCAL);
logRecord.setLogType(LogType.WAIT);
- logRecord.setJobId(txnCtx.getJobId().getId());
+ logRecord.setTxnId(txnCtx.getTxnId().getId());
logRecord.computeAndSetLogSize();
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallbackFactory.java
index b3d4f03..9f96263 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/LockThenSearchOperationCallbackFactory.java
@@ -18,16 +18,18 @@
*/
package org.apache.asterix.transaction.management.opcallbacks;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.context.ITransactionSubsystemProvider;
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
public class LockThenSearchOperationCallbackFactory extends AbstractOperationCallbackFactory
@@ -35,9 +37,9 @@
private static final long serialVersionUID = 1L;
- public LockThenSearchOperationCallbackFactory(JobId jobId, int datasetId, int[] entityIdFields,
+ public LockThenSearchOperationCallbackFactory(TxnId txnId, int datasetId, int[] entityIdFields,
ITransactionSubsystemProvider txnSubsystemProvider, byte resourceType) {
- super(jobId, datasetId, entityIdFields, txnSubsystemProvider, resourceType);
+ super(txnId, datasetId, entityIdFields, txnSubsystemProvider, resourceType);
}
@Override
@@ -45,9 +47,11 @@
IOperatorNodePushable operatorNodePushable) throws HyracksDataException {
ITransactionSubsystem txnSubsystem = txnSubsystemProvider.getTransactionSubsystem(ctx);
try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- return new LockThenSearchOperationCallback(new DatasetId(datasetId), primaryKeyFields, txnSubsystem, txnCtx,
- operatorNodePushable);
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ ITransactionContext txnCtx = txnSubsystem.getTransactionManager()
+ .getTransactionContext(((IJobEventListenerFactory) fact).getTxnId(txnId));
+ return new LockThenSearchOperationCallback(new DatasetId(datasetId), resourceId, primaryKeyFields,
+ txnSubsystem, txnCtx, operatorNodePushable);
} catch (ACIDException e) {
throw new HyracksDataException(e);
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallback.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallback.java
index b13a08e..ec776a5 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallback.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallback.java
@@ -35,9 +35,9 @@
public class PrimaryIndexInstantSearchOperationCallback extends AbstractOperationCallback
implements ISearchOperationCallback {
- public PrimaryIndexInstantSearchOperationCallback(DatasetId datasetId, int[] entityIdFields,
+ public PrimaryIndexInstantSearchOperationCallback(DatasetId datasetId, long resourceId, int[] entityIdFields,
ILockManager lockManager, ITransactionContext txnCtx) {
- super(datasetId, entityIdFields, txnCtx, lockManager);
+ super(datasetId, resourceId, entityIdFields, txnCtx, lockManager);
}
@Override
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallbackFactory.java
index 0d447a9..f9c8e3c 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexInstantSearchOperationCallbackFactory.java
@@ -19,37 +19,41 @@
package org.apache.asterix.transaction.management.opcallbacks;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.context.ITransactionSubsystemProvider;
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
-public class PrimaryIndexInstantSearchOperationCallbackFactory extends AbstractOperationCallbackFactory implements
- ISearchOperationCallbackFactory {
+public class PrimaryIndexInstantSearchOperationCallbackFactory extends AbstractOperationCallbackFactory
+ implements ISearchOperationCallbackFactory {
private static final long serialVersionUID = 1L;
- public PrimaryIndexInstantSearchOperationCallbackFactory(JobId jobId, int datasetId, int[] entityIdFields,
+ public PrimaryIndexInstantSearchOperationCallbackFactory(TxnId txnId, int datasetId, int[] entityIdFields,
ITransactionSubsystemProvider txnSubsystemProvider, byte resourceType) {
- super(jobId, datasetId, entityIdFields, txnSubsystemProvider, resourceType);
+ super(txnId, datasetId, entityIdFields, txnSubsystemProvider, resourceType);
}
@Override
- public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable)
- throws HyracksDataException {
+ public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx,
+ IOperatorNodePushable operatorNodePushable) throws HyracksDataException {
ITransactionSubsystem txnSubsystem = txnSubsystemProvider.getTransactionSubsystem(ctx);
try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- return new PrimaryIndexInstantSearchOperationCallback(new DatasetId(datasetId), primaryKeyFields,
- txnSubsystem.getLockManager(), txnCtx);
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ ITransactionContext txnCtx = txnSubsystem.getTransactionManager()
+ .getTransactionContext(((IJobEventListenerFactory) fact).getTxnId(txnId));
+ return new PrimaryIndexInstantSearchOperationCallback(new DatasetId(datasetId), resourceId,
+ primaryKeyFields, txnSubsystem.getLockManager(), txnCtx);
} catch (ACIDException e) {
throw new HyracksDataException(e);
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexModificationOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexModificationOperationCallbackFactory.java
index 932c925..8f5e386 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexModificationOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexModificationOperationCallbackFactory.java
@@ -19,19 +19,20 @@
package org.apache.asterix.transaction.management.opcallbacks;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.context.ITransactionSubsystemProvider;
import org.apache.asterix.common.dataflow.DatasetLocalResource;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.transaction.management.opcallbacks.AbstractIndexModificationOperationCallback.Operation;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.common.IIndex;
@@ -48,9 +49,9 @@
private static final long serialVersionUID = 1L;
private final Operation indexOp;
- public PrimaryIndexModificationOperationCallbackFactory(JobId jobId, int datasetId, int[] primaryKeyFields,
+ public PrimaryIndexModificationOperationCallbackFactory(TxnId txnId, int datasetId, int[] primaryKeyFields,
ITransactionSubsystemProvider txnSubsystemProvider, Operation indexOp, byte resourceType) {
- super(jobId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
+ super(txnId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
this.indexOp = indexOp;
}
@@ -66,12 +67,14 @@
}
try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ ITransactionContext txnCtx = txnSubsystem.getTransactionManager()
+ .getTransactionContext(((IJobEventListenerFactory) fact).getTxnId(txnId));
DatasetLocalResource aResource = (DatasetLocalResource) resource.getResource();
IModificationOperationCallback modCallback = new PrimaryIndexModificationOperationCallback(
new DatasetId(datasetId), primaryKeyFields, txnCtx, txnSubsystem.getLockManager(), txnSubsystem,
resource.getId(), aResource.getPartition(), resourceType, indexOp, operatorNodePushable);
- txnCtx.registerIndexAndCallback(resource.getId(), index, (AbstractOperationCallback) modCallback, true);
+ txnCtx.register(resource.getId(), index, modCallback, true);
return modCallback;
} catch (ACIDException e) {
throw HyracksDataException.create(e);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallback.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallback.java
index a9075d0..961f799 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallback.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallback.java
@@ -34,9 +34,9 @@
*/
public class PrimaryIndexSearchOperationCallback extends AbstractOperationCallback implements ISearchOperationCallback {
- public PrimaryIndexSearchOperationCallback(DatasetId datasetId, int[] entityIdFields, ILockManager lockManager,
- ITransactionContext txnCtx) {
- super(datasetId, entityIdFields, txnCtx, lockManager);
+ public PrimaryIndexSearchOperationCallback(DatasetId datasetId, long resourceId, int[] entityIdFields,
+ ILockManager lockManager, ITransactionContext txnCtx) {
+ super(datasetId, resourceId, entityIdFields, txnCtx, lockManager);
}
@Override
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallbackFactory.java
index 8bdbb9e..64cbbc9 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/PrimaryIndexSearchOperationCallbackFactory.java
@@ -19,16 +19,18 @@
package org.apache.asterix.transaction.management.opcallbacks;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.context.ITransactionSubsystemProvider;
import org.apache.asterix.common.exceptions.ACIDException;
import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
@@ -37,9 +39,9 @@
private static final long serialVersionUID = 1L;
- public PrimaryIndexSearchOperationCallbackFactory(JobId jobId, int datasetId, int[] entityIdFields,
+ public PrimaryIndexSearchOperationCallbackFactory(TxnId txnId, int datasetId, int[] entityIdFields,
ITransactionSubsystemProvider txnSubsystemProvider, byte resourceType) {
- super(jobId, datasetId, entityIdFields, txnSubsystemProvider, resourceType);
+ super(txnId, datasetId, entityIdFields, txnSubsystemProvider, resourceType);
}
@Override
@@ -47,8 +49,10 @@
IOperatorNodePushable operatorNodePushable) throws HyracksDataException {
ITransactionSubsystem txnSubsystem = txnSubsystemProvider.getTransactionSubsystem(ctx);
try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- return new PrimaryIndexSearchOperationCallback(new DatasetId(datasetId), primaryKeyFields,
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ ITransactionContext txnCtx = txnSubsystem.getTransactionManager()
+ .getTransactionContext(((IJobEventListenerFactory) fact).getTxnId(txnId));
+ return new PrimaryIndexSearchOperationCallback(new DatasetId(datasetId), resourceId, primaryKeyFields,
txnSubsystem.getLockManager(), txnCtx);
} catch (ACIDException e) {
throw new HyracksDataException(e);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.java
index b339d27..3fc42c9 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexModificationOperationCallbackFactory.java
@@ -19,19 +19,20 @@
package org.apache.asterix.transaction.management.opcallbacks;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.context.ITransactionSubsystemProvider;
import org.apache.asterix.common.dataflow.DatasetLocalResource;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.transaction.management.opcallbacks.AbstractIndexModificationOperationCallback.Operation;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
@@ -44,9 +45,9 @@
private static final long serialVersionUID = 1L;
private final Operation indexOp;
- public SecondaryIndexModificationOperationCallbackFactory(JobId jobId, int datasetId, int[] primaryKeyFields,
+ public SecondaryIndexModificationOperationCallbackFactory(TxnId txnId, int datasetId, int[] primaryKeyFields,
ITransactionSubsystemProvider txnSubsystemProvider, Operation indexOp, byte resourceType) {
- super(jobId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
+ super(txnId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
this.indexOp = indexOp;
}
@@ -62,12 +63,14 @@
}
try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ ITransactionContext txnCtx = txnSubsystem.getTransactionManager()
+ .getTransactionContext(((IJobEventListenerFactory) fact).getTxnId(txnId));
DatasetLocalResource aResource = (DatasetLocalResource) resource.getResource();
IModificationOperationCallback modCallback = new SecondaryIndexModificationOperationCallback(
new DatasetId(datasetId), primaryKeyFields, txnCtx, txnSubsystem.getLockManager(), txnSubsystem,
resource.getId(), aResource.getPartition(), resourceType, indexOp);
- txnCtx.registerIndexAndCallback(resource.getId(), index, (AbstractOperationCallback) modCallback, false);
+ txnCtx.register(resource.getId(), index, modCallback, false);
return modCallback;
} catch (ACIDException e) {
throw HyracksDataException.create(e);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallback.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallback.java
index 108a77e..1b87376 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallback.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallback.java
@@ -31,8 +31,8 @@
public class SecondaryIndexSearchOperationCallback extends AbstractOperationCallback
implements ISearchOperationCallback {
- public SecondaryIndexSearchOperationCallback() {
- super(DatasetId.NULL, null, null, null);
+ public SecondaryIndexSearchOperationCallback(long resourceId) {
+ super(DatasetId.NULL, resourceId, null, null, null);
}
@Override
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java
index 0b96164..972668a 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/SecondaryIndexSearchOperationCallbackFactory.java
@@ -32,6 +32,6 @@
@Override
public ISearchOperationCallback createSearchOperationCallback(long resourceId, IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable)
throws HyracksDataException {
- return new SecondaryIndexSearchOperationCallback();
+ return new SecondaryIndexSearchOperationCallback(resourceId);
}
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetIndexModificationOperationCallback.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetIndexModificationOperationCallback.java
deleted file mode 100644
index c609fc6..0000000
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetIndexModificationOperationCallback.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterix.transaction.management.opcallbacks;
-
-import org.apache.asterix.common.transactions.DatasetId;
-import org.apache.asterix.common.transactions.ILockManager;
-import org.apache.asterix.common.transactions.ITransactionContext;
-import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
-
-/**
- * This class is the operation callback for temporary datasets.
- * A temporary dataset does not require any lock and does not generate any write-ahead update and commit log
- * but generates flush log and job commit log.
- * The "before" and "found" method in this callback is empty so that no locking is requested for accessing a temporary
- * dataset and no write-ahead log is written for update operations.
- */
-public class TempDatasetIndexModificationOperationCallback extends AbstractIndexModificationOperationCallback {
-
- public TempDatasetIndexModificationOperationCallback(DatasetId datasetId, int[] primaryKeyFields,
- ITransactionContext txnCtx, ILockManager lockManager, ITransactionSubsystem txnSubsystem, long resourceId,
- int resourcePartition, byte resourceType, Operation indexOp) {
- super(datasetId, primaryKeyFields, txnCtx, lockManager, txnSubsystem, resourceId, resourcePartition,
- resourceType, indexOp);
- }
-
- @Override
- public void before(ITupleReference tuple) throws HyracksDataException {
-
- }
-
- @Override
- public void found(ITupleReference before, ITupleReference after) throws HyracksDataException {
-
- }
-}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetPrimaryIndexModificationOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetPrimaryIndexModificationOperationCallbackFactory.java
deleted file mode 100644
index 7b7eff6..0000000
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetPrimaryIndexModificationOperationCallbackFactory.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterix.transaction.management.opcallbacks;
-
-import org.apache.asterix.common.context.ITransactionSubsystemProvider;
-import org.apache.asterix.common.dataflow.DatasetLocalResource;
-import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
-import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
-import org.apache.asterix.common.transactions.DatasetId;
-import org.apache.asterix.common.transactions.ITransactionContext;
-import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
-import org.apache.asterix.transaction.management.opcallbacks.AbstractIndexModificationOperationCallback.Operation;
-import org.apache.hyracks.api.context.IHyracksTaskContext;
-import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.IResourceLifecycleManager;
-import org.apache.hyracks.storage.common.LocalResource;
-
-public class TempDatasetPrimaryIndexModificationOperationCallbackFactory extends AbstractOperationCallbackFactory
- implements IModificationOperationCallbackFactory {
-
- private static final long serialVersionUID = 1L;
- private final Operation indexOp;
-
- public TempDatasetPrimaryIndexModificationOperationCallbackFactory(JobId jobId, int datasetId,
- int[] primaryKeyFields, ITransactionSubsystemProvider txnSubsystemProvider, Operation indexOp,
- byte resourceType) {
- super(jobId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
- this.indexOp = indexOp;
- }
-
- @Override
- public IModificationOperationCallback createModificationOperationCallback(LocalResource resource,
- IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable) throws HyracksDataException {
- ITransactionSubsystem txnSubsystem = txnSubsystemProvider.getTransactionSubsystem(ctx);
- IResourceLifecycleManager indexLifeCycleManager =
- txnSubsystem.getAsterixAppRuntimeContextProvider().getDatasetLifecycleManager();
- ILSMIndex index = (ILSMIndex) indexLifeCycleManager.get(resource.getPath());
- if (index == null) {
- throw new HyracksDataException("Index(id:" + resource.getId() + ") is not registered.");
- }
-
- try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- DatasetLocalResource aResource = (DatasetLocalResource) resource.getResource();
- IModificationOperationCallback modCallback = new TempDatasetIndexModificationOperationCallback(
- new DatasetId(datasetId), primaryKeyFields, txnCtx, txnSubsystem.getLockManager(), txnSubsystem,
- resource.getId(), aResource.getPartition(), resourceType, indexOp);
- txnCtx.registerIndexAndCallback(resource.getId(), index, (AbstractOperationCallback) modCallback, true);
- return modCallback;
- } catch (ACIDException e) {
- throw new HyracksDataException(e);
- }
- }
-}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetSecondaryIndexModificationOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetSecondaryIndexModificationOperationCallbackFactory.java
deleted file mode 100644
index 1dc1c4e..0000000
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/TempDatasetSecondaryIndexModificationOperationCallbackFactory.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterix.transaction.management.opcallbacks;
-
-import org.apache.asterix.common.context.ITransactionSubsystemProvider;
-import org.apache.asterix.common.dataflow.DatasetLocalResource;
-import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
-import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
-import org.apache.asterix.common.transactions.DatasetId;
-import org.apache.asterix.common.transactions.ITransactionContext;
-import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
-import org.apache.asterix.transaction.management.opcallbacks.AbstractIndexModificationOperationCallback.Operation;
-import org.apache.hyracks.api.context.IHyracksTaskContext;
-import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.common.IIndex;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.IResourceLifecycleManager;
-import org.apache.hyracks.storage.common.LocalResource;
-
-public class TempDatasetSecondaryIndexModificationOperationCallbackFactory extends AbstractOperationCallbackFactory
- implements IModificationOperationCallbackFactory {
-
- private static final long serialVersionUID = 1L;
- private final Operation indexOp;
-
- public TempDatasetSecondaryIndexModificationOperationCallbackFactory(JobId jobId, int datasetId,
- int[] primaryKeyFields, ITransactionSubsystemProvider txnSubsystemProvider, Operation indexOp,
- byte resourceType) {
- super(jobId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
- this.indexOp = indexOp;
- }
-
- @Override
- public IModificationOperationCallback createModificationOperationCallback(LocalResource resource,
- IHyracksTaskContext ctx, IOperatorNodePushable operatorNodePushable) throws HyracksDataException {
- DatasetLocalResource aResource = (DatasetLocalResource) resource.getResource();
- ITransactionSubsystem txnSubsystem = txnSubsystemProvider.getTransactionSubsystem(ctx);
- IResourceLifecycleManager<IIndex> indexLifeCycleManager =
- txnSubsystem.getAsterixAppRuntimeContextProvider().getDatasetLifecycleManager();
- ILSMIndex index = (ILSMIndex) indexLifeCycleManager.get(resource.getPath());
- if (index == null) {
- throw new HyracksDataException("Index(id:" + resource.getId() + ") is not registered.");
- }
-
- try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
- IModificationOperationCallback modCallback = new TempDatasetIndexModificationOperationCallback(
- new DatasetId(datasetId), primaryKeyFields, txnCtx, txnSubsystem.getLockManager(), txnSubsystem,
- resource.getId(), aResource.getPartition(), resourceType, indexOp);
- txnCtx.registerIndexAndCallback(resource.getId(), index, (AbstractOperationCallback) modCallback, false);
- return modCallback;
- } catch (ACIDException e) {
- throw new HyracksDataException(e);
- }
- }
-}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/UpsertOperationCallbackFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/UpsertOperationCallbackFactory.java
index 15b4344..da4aab8 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/UpsertOperationCallbackFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/opcallbacks/UpsertOperationCallbackFactory.java
@@ -18,19 +18,20 @@
*/
package org.apache.asterix.transaction.management.opcallbacks;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
import org.apache.asterix.common.context.ITransactionSubsystemProvider;
import org.apache.asterix.common.dataflow.DatasetLocalResource;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
import org.apache.asterix.common.transactions.AbstractOperationCallbackFactory;
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.transaction.management.opcallbacks.AbstractIndexModificationOperationCallback.Operation;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.dataflow.IOperatorNodePushable;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
@@ -43,9 +44,9 @@
private static final long serialVersionUID = 1L;
protected final Operation indexOp;
- public UpsertOperationCallbackFactory(JobId jobId, int datasetId, int[] primaryKeyFields,
+ public UpsertOperationCallbackFactory(TxnId txnId, int datasetId, int[] primaryKeyFields,
ITransactionSubsystemProvider txnSubsystemProvider, Operation indexOp, byte resourceType) {
- super(jobId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
+ super(txnId, datasetId, primaryKeyFields, txnSubsystemProvider, resourceType);
this.indexOp = indexOp;
}
@@ -62,11 +63,13 @@
}
try {
- ITransactionContext txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(jobId, false);
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ ITransactionContext txnCtx = txnSubsystem.getTransactionManager()
+ .getTransactionContext(((IJobEventListenerFactory) fact).getTxnId(txnId));
IModificationOperationCallback modCallback = new UpsertOperationCallback(new DatasetId(datasetId),
primaryKeyFields, txnCtx, txnSubsystem.getLockManager(), txnSubsystem, resource.getId(),
aResource.getPartition(), resourceType, indexOp);
- txnCtx.registerIndexAndCallback(resource.getId(), index, (AbstractOperationCallback) modCallback, true);
+ txnCtx.register(resource.getId(), index, modCallback, true);
return modCallback;
} catch (ACIDException e) {
throw new HyracksDataException(e);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
index 5666b48..db3647e 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceRepository.java
@@ -380,25 +380,14 @@
private void createReplicationJob(ReplicationOperation operation, FileReference fileRef)
throws HyracksDataException {
- /**
- * Durable resources path format:
- * /partition/dataverse/idx/fileName
- * Temporary resources path format:
- * /partition/TEMP_DATASETS_STORAGE_FOLDER/dataverse/idx/fileName
- */
- String[] fileNameTokens = fileRef.getAbsolutePath().split(File.separator);
- String partitionDir = fileNameTokens[fileNameTokens.length - 4];
- //exclude temporary datasets resources
- if (!partitionDir.equals(StoragePathUtil.TEMP_DATASETS_STORAGE_FOLDER)) {
- filesToBeReplicated.clear();
- filesToBeReplicated.add(fileRef.getAbsolutePath());
- ReplicationJob job = new ReplicationJob(ReplicationJobType.METADATA, operation,
- ReplicationExecutionType.SYNC, filesToBeReplicated);
- try {
- replicationManager.submitJob(job);
- } catch (IOException e) {
- throw new HyracksDataException(e);
- }
+ filesToBeReplicated.clear();
+ filesToBeReplicated.add(fileRef.getAbsolutePath());
+ ReplicationJob job = new ReplicationJob(ReplicationJobType.METADATA, operation, ReplicationExecutionType.SYNC,
+ filesToBeReplicated);
+ try {
+ replicationManager.submitJob(job);
+ } catch (IOException e) {
+ throw new HyracksDataException(e);
}
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntime.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntime.java
index 1e22458..d298bef 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntime.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntime.java
@@ -27,9 +27,9 @@
import org.apache.asterix.common.transactions.ILogMarkerCallback;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionManager;
-import org.apache.asterix.common.transactions.JobId;
import org.apache.asterix.common.transactions.LogRecord;
import org.apache.asterix.common.transactions.LogType;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.TransactionUtil;
import org.apache.hyracks.algebricks.runtime.operators.base.AbstractOneInputOneOutputOneFramePushRuntime;
import org.apache.hyracks.api.comm.IFrame;
@@ -50,10 +50,9 @@
protected final ITransactionManager transactionManager;
protected final ILogManager logMgr;
- protected final JobId jobId;
+ protected final TxnId txnId;
protected final int datasetId;
protected final int[] primaryKeyFields;
- protected final boolean isTemporaryDatasetWriteJob;
protected final boolean isWriteTransaction;
protected final long[] longHashes;
protected final IHyracksTaskContext ctx;
@@ -62,18 +61,17 @@
protected LogRecord logRecord;
protected final boolean isSink;
- public CommitRuntime(IHyracksTaskContext ctx, JobId jobId, int datasetId, int[] primaryKeyFields,
- boolean isTemporaryDatasetWriteJob, boolean isWriteTransaction, int resourcePartition, boolean isSink) {
+ public CommitRuntime(IHyracksTaskContext ctx, TxnId txnId, int datasetId, int[] primaryKeyFields,
+ boolean isWriteTransaction, int resourcePartition, boolean isSink) {
this.ctx = ctx;
INcApplicationContext appCtx =
(INcApplicationContext) ctx.getJobletContext().getServiceContext().getApplicationContext();
this.transactionManager = appCtx.getTransactionSubsystem().getTransactionManager();
this.logMgr = appCtx.getTransactionSubsystem().getLogManager();
- this.jobId = jobId;
+ this.txnId = txnId;
this.datasetId = datasetId;
this.primaryKeyFields = primaryKeyFields;
this.tRef = new FrameTupleReference();
- this.isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob;
this.isWriteTransaction = isWriteTransaction;
this.resourcePartition = resourcePartition;
this.isSink = isSink;
@@ -83,7 +81,7 @@
@Override
public void open() throws HyracksDataException {
try {
- transactionContext = transactionManager.getTransactionContext(jobId, false);
+ transactionContext = transactionManager.getTransactionContext(txnId);
transactionContext.setWriteTxn(isWriteTransaction);
ILogMarkerCallback callback = TaskUtil.get(ILogMarkerCallback.KEY_MARKER_CALLBACK, ctx);
logRecord = new LogRecord(callback);
@@ -102,29 +100,15 @@
tAccess.reset(buffer);
int nTuple = tAccess.getTupleCount();
for (int t = 0; t < nTuple; t++) {
- if (isTemporaryDatasetWriteJob) {
- /**
- * This "if branch" is for writes over temporary datasets. A temporary dataset does not require any lock
- * and does not generate any write-ahead update and commit log but generates flush log and job commit
- * log. However, a temporary dataset still MUST guarantee no-steal policy so that this notification call
- * should be delivered to PrimaryIndexOptracker and used correctly in order to decrement number of
- * active operation count of PrimaryIndexOptracker. By maintaining the count correctly and only allowing
- * flushing when the count is 0, it can guarantee the no-steal policy for temporary datasets, too.
- */
- // TODO: Fix this for upserts. an upsert tuple right now expect to notify the opTracker twice (one for
- // delete and one for insert)
- transactionContext.notifyOptracker(false);
- } else {
- tRef.reset(tAccess, t);
- try {
- formLogRecord(buffer, t);
- logMgr.log(logRecord);
- if (!isSink) {
- appendTupleToFrame(t);
- }
- } catch (ACIDException e) {
- throw new HyracksDataException(e);
+ tRef.reset(tAccess, t);
+ try {
+ formLogRecord(buffer, t);
+ logMgr.log(logRecord);
+ if (!isSink) {
+ appendTupleToFrame(t);
}
+ } catch (ACIDException e) {
+ throw new HyracksDataException(e);
}
}
IFrame message = TaskUtil.get(HyracksConstants.KEY_MESSAGE, ctx);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java
index 1b32d89..91db197 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/runtime/CommitRuntimeFactory.java
@@ -19,30 +19,30 @@
package org.apache.asterix.transaction.management.runtime;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.api.IJobEventListenerFactory;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.algebricks.runtime.base.IPushRuntime;
import org.apache.hyracks.algebricks.runtime.base.IPushRuntimeFactory;
import org.apache.hyracks.api.context.IHyracksTaskContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
public class CommitRuntimeFactory implements IPushRuntimeFactory {
private static final long serialVersionUID = 1L;
- protected final JobId jobId;
+ protected final TxnId txnId;
protected final int datasetId;
protected final int[] primaryKeyFields;
- protected final boolean isTemporaryDatasetWriteJob;
protected final boolean isWriteTransaction;
protected int[] datasetPartitions;
protected final boolean isSink;
- public CommitRuntimeFactory(JobId jobId, int datasetId, int[] primaryKeyFields, boolean isTemporaryDatasetWriteJob,
- boolean isWriteTransaction, int[] datasetPartitions, boolean isSink) {
- this.jobId = jobId;
+ public CommitRuntimeFactory(TxnId txnId, int datasetId, int[] primaryKeyFields, boolean isWriteTransaction,
+ int[] datasetPartitions, boolean isSink) {
+ this.txnId = txnId;
this.datasetId = datasetId;
this.primaryKeyFields = primaryKeyFields;
- this.isTemporaryDatasetWriteJob = isTemporaryDatasetWriteJob;
this.isWriteTransaction = isWriteTransaction;
this.datasetPartitions = datasetPartitions;
this.isSink = isSink;
@@ -55,7 +55,8 @@
@Override
public IPushRuntime createPushRuntime(IHyracksTaskContext ctx) throws HyracksDataException {
- return new CommitRuntime(ctx, jobId, datasetId, primaryKeyFields, isTemporaryDatasetWriteJob,
- isWriteTransaction, datasetPartitions[ctx.getTaskAttemptId().getTaskId().getPartition()], isSink);
+ IJobletEventListenerFactory fact = ctx.getJobletContext().getJobletEventListenerFactory();
+ return new CommitRuntime(ctx, ((IJobEventListenerFactory) fact).getTxnId(txnId), datasetId, primaryKeyFields,
+ isWriteTransaction, datasetPartitions[ctx.getTaskAttemptId().getTaskId().getPartition()], isSink);
}
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
index f386b39..3aa2578 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ConcurrentLockManager.java
@@ -57,7 +57,7 @@
private ResourceArenaManager resArenaMgr;
private RequestArenaManager reqArenaMgr;
private JobArenaManager jobArenaMgr;
- private ConcurrentHashMap<Integer, Long> jobId2JobSlotMap;
+ private ConcurrentHashMap<Long, Long> txnId2TxnSlotMap;
private LockManagerStats stats = new LockManagerStats(10000);
enum LockAction {
@@ -96,7 +96,7 @@
resArenaMgr = new ResourceArenaManager(noArenas, lockManagerShrinkTimer);
reqArenaMgr = new RequestArenaManager(noArenas, lockManagerShrinkTimer);
jobArenaMgr = new JobArenaManager(noArenas, lockManagerShrinkTimer);
- jobId2JobSlotMap = new ConcurrentHashMap<>();
+ txnId2TxnSlotMap = new ConcurrentHashMap<>();
}
@Override
@@ -105,8 +105,8 @@
log("lock", datasetId.getId(), entityHashValue, lockMode, txnContext);
stats.lock();
- final int jobId = txnContext.getJobId().getId();
- final long jobSlot = findOrAllocJobSlot(jobId);
+ final long txnId = txnContext.getTxnId().getId();
+ final long jobSlot = findOrAllocJobSlot(txnId);
final ResourceGroup group = table.get(datasetId.getId(), entityHashValue);
group.getLatch();
try {
@@ -328,7 +328,7 @@
log("instantLock", datasetId.getId(), entityHashValue, lockMode, txnContext);
stats.instantLock();
- final int jobId = txnContext.getJobId().getId();
+ final long txnId = txnContext.getTxnId().getId();
final ResourceGroup group = table.get(datasetId.getId(), entityHashValue);
if (group.firstResourceIndex.get() == NILL) {
validateJob(txnContext);
@@ -349,7 +349,7 @@
return;
}
- final long jobSlot = findOrAllocJobSlot(jobId);
+ final long jobSlot = findOrAllocJobSlot(txnId);
while (true) {
final LockAction act = determineLockAction(resSlot, jobSlot, lockMode);
@@ -389,8 +389,8 @@
log("tryLock", datasetId.getId(), entityHashValue, lockMode, txnContext);
stats.tryLock();
- final int jobId = txnContext.getJobId().getId();
- final long jobSlot = findOrAllocJobSlot(jobId);
+ final long txnId = txnContext.getTxnId().getId();
+ final long jobSlot = findOrAllocJobSlot(txnId);
final ResourceGroup group = table.get(datasetId.getId(), entityHashValue);
group.getLatch();
@@ -425,7 +425,7 @@
log("instantTryLock", datasetId.getId(), entityHashValue, lockMode, txnContext);
stats.instantTryLock();
- final int jobId = txnContext.getJobId().getId();
+ final long txnId = txnContext.getTxnId().getId();
final ResourceGroup group = table.get(datasetId.getId(), entityHashValue);
if (group.firstResourceIndex.get() == NILL) {
validateJob(txnContext);
@@ -444,7 +444,7 @@
return true;
}
- final long jobSlot = findOrAllocJobSlot(jobId);
+ final long jobSlot = findOrAllocJobSlot(txnId);
LockAction act = determineLockAction(resSlot, jobSlot, lockMode);
switch (act) {
@@ -467,8 +467,8 @@
public void unlock(DatasetId datasetId, int entityHashValue, byte lockMode, ITransactionContext txnContext)
throws ACIDException {
log("unlock", datasetId.getId(), entityHashValue, lockMode, txnContext);
- final int jobId = txnContext.getJobId().getId();
- final long jobSlot = jobId2JobSlotMap.get(jobId);
+ final long txnId = txnContext.getTxnId().getId();
+ final long jobSlot = txnId2TxnSlotMap.get(txnId);
unlock(datasetId.getId(), entityHashValue, lockMode, jobSlot);
}
@@ -528,8 +528,8 @@
log("releaseLocks", NIL, NIL, LockMode.ANY, txnContext);
stats.releaseLocks();
- int jobId = txnContext.getJobId().getId();
- Long jobSlot = jobId2JobSlotMap.get(jobId);
+ long txnId = txnContext.getTxnId().getId();
+ Long jobSlot = txnId2TxnSlotMap.get(txnId);
if (jobSlot == null) {
// we don't know the job, so there are no locks for it - we're done
return;
@@ -557,19 +557,19 @@
LOGGER.finer("del job slot " + TypeUtil.Global.toString(jobSlot));
}
jobArenaMgr.deallocate(jobSlot);
- jobId2JobSlotMap.remove(jobId);
+ txnId2TxnSlotMap.remove(txnId);
stats.logCounters(LOGGER, Level.FINE, true);
}
- private long findOrAllocJobSlot(int jobId) {
- Long jobSlot = jobId2JobSlotMap.get(jobId);
+ private long findOrAllocJobSlot(long txnId) {
+ Long jobSlot = txnId2TxnSlotMap.get(txnId);
if (jobSlot == null) {
jobSlot = new Long(jobArenaMgr.allocate());
if (DEBUG_MODE) {
- LOGGER.finer("new job slot " + TypeUtil.Global.toString(jobSlot) + " (" + jobId + ")");
+ LOGGER.finer("new job slot " + TypeUtil.Global.toString(jobSlot) + " (" + txnId + ")");
}
- jobArenaMgr.setJobId(jobSlot, jobId);
- Long oldSlot = jobId2JobSlotMap.putIfAbsent(jobId, jobSlot);
+ jobArenaMgr.setTxnId(jobSlot, txnId);
+ Long oldSlot = txnId2TxnSlotMap.putIfAbsent(txnId, jobSlot);
if (oldSlot != null) {
// if another thread allocated a slot for this jobThreadId between
// get(..) and putIfAbsent(..), we'll use that slot and
@@ -917,7 +917,7 @@
private void validateJob(ITransactionContext txnContext) throws ACIDException {
if (txnContext.getTxnState() == ITransactionManager.ABORTED) {
- throw new ACIDException("" + txnContext.getJobId() + " is in ABORTED state.");
+ throw new ACIDException("" + txnContext.getTxnId() + " is in ABORTED state.");
} else if (txnContext.isTimeout()) {
requestAbort(txnContext, "timeout");
}
@@ -926,7 +926,7 @@
private void requestAbort(ITransactionContext txnContext, String msg) throws ACIDException {
txnContext.setTimeout(true);
throw new ACIDException(
- "Transaction " + txnContext.getJobId() + " should abort (requested by the Lock Manager)" + ":\n" + msg);
+ "Transaction " + txnContext.getTxnId() + " should abort (requested by the Lock Manager)" + ":\n" + msg);
}
/*
@@ -949,7 +949,7 @@
sb.append(" , mode : ").append(LockMode.toString(lockMode));
}
if (txnContext != null) {
- sb.append(" , jobId : ").append(txnContext.getJobId());
+ sb.append(" , txnId : ").append(txnContext.getTxnId());
}
sb.append(" , thread : ").append(Thread.currentThread().getName());
sb.append(" }");
@@ -970,8 +970,8 @@
while (reqSlot != NILL) {
byte lockMode = (byte) reqArenaMgr.getLockMode(reqSlot);
long jobSlot = reqArenaMgr.getJobSlot(reqSlot);
- int jobId = jobArenaMgr.getJobId(jobSlot);
- assertLockCanBeFoundInJobQueue(dsId, entityHashValue, lockMode, jobId);
+ long txnId = jobArenaMgr.getTxnId(jobSlot);
+ assertLockCanBeFoundInJobQueue(dsId, entityHashValue, lockMode, txnId);
reqSlot = reqArenaMgr.getNextRequest(reqSlot);
}
resSlot = resArenaMgr.getNext(resSlot);
@@ -988,10 +988,10 @@
}
}
- private void assertLockCanBeFoundInJobQueue(int dsId, int entityHashValue, byte lockMode, int jobId) {
- if (findLockInJobQueue(dsId, entityHashValue, jobId, lockMode) == NILL) {
+ private void assertLockCanBeFoundInJobQueue(int dsId, int entityHashValue, byte lockMode, long txnId) {
+ if (findLockInJobQueue(dsId, entityHashValue, txnId, lockMode) == NILL) {
String msg = "request for " + LockMode.toString(lockMode) + " lock on dataset " + dsId + " entity "
- + entityHashValue + " not found for job " + jobId + " in thread "
+ + entityHashValue + " not found for txn " + txnId + " in thread "
+ Thread.currentThread().getName();
LOGGER.severe(msg);
throw new IllegalStateException(msg);
@@ -1005,14 +1005,14 @@
* dataset id
* @param entityHashValue
* primary key hash value
- * @param jobId
+ * @param txnId
* job id
* @param lockMode
* lock mode
* @return the slot of the request, if the lock request is found, NILL otherwise
*/
- private long findLockInJobQueue(final int dsId, final int entityHashValue, final int jobId, byte lockMode) {
- Long jobSlot = jobId2JobSlotMap.get(jobId);
+ private long findLockInJobQueue(final int dsId, final int entityHashValue, final long txnId, byte lockMode) {
+ Long jobSlot = txnId2TxnSlotMap.get(txnId);
if (jobSlot == null) {
return NILL;
}
@@ -1040,7 +1040,7 @@
}
private TablePrinter getDumpTablePrinter() {
- return new DumpTablePrinter(table, resArenaMgr, reqArenaMgr, jobArenaMgr, jobId2JobSlotMap);
+ return new DumpTablePrinter(table, resArenaMgr, reqArenaMgr, jobArenaMgr, txnId2TxnSlotMap);
}
public String printByResource() {
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/DumpTablePrinter.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/DumpTablePrinter.java
index a75f756..26261c2 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/DumpTablePrinter.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/DumpTablePrinter.java
@@ -26,15 +26,15 @@
private ResourceArenaManager resArenaMgr;
private RequestArenaManager reqArenaMgr;
private JobArenaManager jobArenaMgr;
- private ConcurrentHashMap<Integer, Long> jobId2JobSlotMap;
+ private ConcurrentHashMap<Long, Long> txnIdToJobSlotMap;
DumpTablePrinter(ResourceGroupTable table, ResourceArenaManager resArenaMgr, RequestArenaManager reqArenaMgr,
- JobArenaManager jobArenaMgr, ConcurrentHashMap<Integer, Long> jobId2JobSlotMap) {
+ JobArenaManager jobArenaMgr, ConcurrentHashMap<Long, Long> txnIdToJobSlotMap) {
this.table = table;
this.resArenaMgr = resArenaMgr;
this.reqArenaMgr = reqArenaMgr;
this.jobArenaMgr = jobArenaMgr;
- this.jobId2JobSlotMap = jobId2JobSlotMap;
+ this.txnIdToJobSlotMap = txnIdToJobSlotMap;
}
public StringBuilder append(StringBuilder sb) {
@@ -52,10 +52,10 @@
reqArenaMgr.append(sb);
sb.append(">>dump_end\t>>----- [reqArenaMgr] -----\n");
- sb.append(">>dump_begin\t>>----- [jobIdSlotMap] -----\n");
- for (Integer i : jobId2JobSlotMap.keySet()) {
+ sb.append(">>dump_begin\t>>----- [txnIdSlotMap] -----\n");
+ for (Long i : txnIdToJobSlotMap.keySet()) {
sb.append(i).append(" : ");
- TypeUtil.Global.append(sb, jobId2JobSlotMap.get(i));
+ TypeUtil.Global.append(sb, txnIdToJobSlotMap.get(i));
sb.append("\n");
}
sb.append(">>dump_end\t>>----- [jobIdSlotMap] -----\n");
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/Job.json b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/Job.json
index a649b7c..5e0f588 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/Job.json
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/Job.json
@@ -17,8 +17,8 @@
"initial" : "-1"
},
{
- "name" : "job id",
- "type" : "INT"
+ "name" : "txn id",
+ "type" : "GLOBAL"
}
]
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceTablePrinter.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceTablePrinter.java
index eff9e21..e8ef2c8 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceTablePrinter.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/locking/ResourceTablePrinter.java
@@ -99,7 +99,7 @@
StringBuilder appendRequest(StringBuilder sb, long req) {
long job = reqArenaMgr.getJobSlot(req);
- sb.append("{ \"job\": ").append(jobArenaMgr.getJobId(job));
+ sb.append("{ \"job\": ").append(jobArenaMgr.getTxnId(job));
sb.append(", \"mode\": \"").append(string(reqArenaMgr.getLockMode(req)));
return sb.append("\" }");
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java
index 668eab1..6ebf52c 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogBuffer.java
@@ -33,11 +33,11 @@
import org.apache.asterix.common.transactions.ILogRecord;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
import org.apache.asterix.common.transactions.LogRecord;
import org.apache.asterix.common.transactions.LogSource;
import org.apache.asterix.common.transactions.LogType;
import org.apache.asterix.common.transactions.MutableLong;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.transaction.management.service.transaction.TransactionManagementConstants.LockManagerConstants.LockMode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
@@ -61,7 +61,7 @@
protected final LinkedBlockingQueue<ILogRecord> remoteJobsQ;
private FileChannel fileChannel;
private boolean stop;
- private final JobId reusableJobId;
+ private final MutableTxnId reusableTxnId;
private final DatasetId reusableDatasetId;
public LogBuffer(ITransactionSubsystem txnSubsystem, int logPageSize, MutableLong flushLSN) {
@@ -79,7 +79,7 @@
syncCommitQ = new LinkedBlockingQueue<>(logPageSize / ILogRecord.JOB_TERMINATE_LOG_SIZE);
flushQ = new LinkedBlockingQueue<>();
remoteJobsQ = new LinkedBlockingQueue<>();
- reusableJobId = new JobId(-1);
+ reusableTxnId = new MutableTxnId(-1);
reusableDatasetId = new DatasetId(-1);
}
@@ -234,27 +234,26 @@
private void batchUnlock(int beginOffset, int endOffset) throws ACIDException {
if (endOffset > beginOffset) {
logBufferTailReader.initializeScan(beginOffset, endOffset);
-
ITransactionContext txnCtx;
-
LogRecord logRecord = logBufferTailReader.next();
while (logRecord != null) {
if (logRecord.getLogSource() == LogSource.LOCAL) {
if (logRecord.getLogType() == LogType.ENTITY_COMMIT) {
- reusableJobId.setId(logRecord.getJobId());
+ reusableTxnId.setId(logRecord.getTxnId());
reusableDatasetId.setId(logRecord.getDatasetId());
- txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(reusableJobId, false);
+ txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(reusableTxnId);
txnSubsystem.getLockManager().unlock(reusableDatasetId, logRecord.getPKHashValue(),
LockMode.ANY, txnCtx);
- txnCtx.notifyOptracker(false);
+ txnCtx.notifyEntityCommitted();
if (txnSubsystem.getTransactionProperties().isCommitProfilerEnabled()) {
txnSubsystem.incrementEntityCommitCount();
}
+ } else if (logRecord.getLogType() == LogType.UPDATE) {
+ reusableTxnId.setId(logRecord.getTxnId());
+ txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(reusableTxnId);
+ txnCtx.notifyUpdateCommitted(logRecord.getResourceId());
} else if (logRecord.getLogType() == LogType.JOB_COMMIT
|| logRecord.getLogType() == LogType.ABORT) {
- reusableJobId.setId(logRecord.getJobId());
- txnCtx = txnSubsystem.getTransactionManager().getTransactionContext(reusableJobId, false);
- txnCtx.notifyOptracker(true);
notifyJobTermination();
} else if (logRecord.getLogType() == LogType.FLUSH) {
notifyFlushTermination();
@@ -266,7 +265,6 @@
notifyReplicationTermination();
}
}
-
logRecord = logBufferTailReader.next();
}
}
@@ -341,4 +339,15 @@
public int getLogPageSize() {
return logPageSize;
}
+
+ private class MutableTxnId extends TxnId {
+
+ public MutableTxnId(long id) {
+ super(id);
+ }
+
+ public void setId(long id) {
+ this.id = id;
+ }
+ }
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java
index 5f9369d..cdd957a 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManager.java
@@ -51,7 +51,7 @@
import org.apache.asterix.common.transactions.LogType;
import org.apache.asterix.common.transactions.MutableLong;
import org.apache.asterix.common.transactions.TxnLogFile;
-import org.apache.asterix.common.utils.InterruptUtil;
+import org.apache.asterix.common.utils.InvokeUtil;
import org.apache.hyracks.api.lifecycle.ILifeCycleComponent;
public class LogManager implements ILogManager, ILifeCycleComponent {
@@ -159,7 +159,7 @@
ITransactionContext txnCtx = logRecord.getTxnCtx();
if (txnCtx.getTxnState() == ITransactionManager.ABORTED && logRecord.getLogType() != LogType.ABORT) {
throw new ACIDException(
- "Aborted job(" + txnCtx.getJobId() + ") tried to write non-abort type log record.");
+ "Aborted txn(" + txnCtx.getTxnId() + ") tried to write non-abort type log record.");
}
}
@@ -580,7 +580,7 @@
@Override
public void closeLogFile(TxnLogFile logFileRef, FileChannel fileChannel) throws IOException {
if (!fileChannel.isOpen()) {
- throw new IllegalStateException("File channel is not open");
+ LOGGER.warning(() -> "Closing log file with id(" + logFileRef.getLogFileId() + ") with a closed channel.");
}
fileChannel.close();
untouchLogFile(logFileRef.getLogFileId());
@@ -655,7 +655,7 @@
public void terminate() {
// make sure the LogFlusher thread started before terminating it.
- InterruptUtil.doUninterruptibly(started::acquire);
+ InvokeUtil.doUninterruptibly(started::acquire);
stopping = true;
@@ -665,7 +665,7 @@
currentFlushPage.stop();
}
// finally we put a POISON_PILL onto the flushQ to indicate to the flusher it is time to exit
- InterruptUtil.doUninterruptibly(() -> flushQ.put(POISON_PILL));
+ InvokeUtil.doUninterruptibly(() -> flushQ.put(POISON_PILL));
}
@Override
@@ -675,7 +675,7 @@
try {
while (true) {
flushPage = null;
- interrupted = InterruptUtil.doUninterruptiblyGet(() -> flushPage = flushQ.take()) || interrupted;
+ interrupted = InvokeUtil.doUninterruptiblyGet(() -> flushPage = flushQ.take()) || interrupted;
if (flushPage == POISON_PILL) {
return true;
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManagerWithReplication.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManagerWithReplication.java
index dd8fb6e..3f94749 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManagerWithReplication.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogManagerWithReplication.java
@@ -35,7 +35,7 @@
private IReplicationManager replicationManager;
private final IReplicationStrategy replicationStrategy;
- private final Set<Integer> replicatedJob = ConcurrentHashMap.newKeySet();
+ private final Set<Long> replicatedTxn = ConcurrentHashMap.newKeySet();
public LogManagerWithReplication(ITransactionSubsystem txnSubsystem, IReplicationStrategy replicationStrategy) {
super(txnSubsystem);
@@ -51,13 +51,13 @@
case LogType.UPDATE:
case LogType.FLUSH:
shouldReplicate = replicationStrategy.isMatch(logRecord.getDatasetId());
- if (shouldReplicate && !replicatedJob.contains(logRecord.getJobId())) {
- replicatedJob.add(logRecord.getJobId());
+ if (shouldReplicate && !replicatedTxn.contains(logRecord.getTxnId())) {
+ replicatedTxn.add(logRecord.getTxnId());
}
break;
case LogType.JOB_COMMIT:
case LogType.ABORT:
- shouldReplicate = replicatedJob.remove(logRecord.getJobId());
+ shouldReplicate = replicatedTxn.remove(logRecord.getTxnId());
break;
default:
shouldReplicate = false;
@@ -120,7 +120,7 @@
ITransactionContext txnCtx = logRecord.getTxnCtx();
if (txnCtx.getTxnState() == ITransactionManager.ABORTED && logRecord.getLogType() != LogType.ABORT) {
throw new ACIDException(
- "Aborted job(" + txnCtx.getJobId() + ") tried to write non-abort type log record.");
+ "Aborted txn(" + txnCtx.getTxnId() + ") tried to write non-abort type log record.");
}
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java
index 148aa7e..f2c5eef 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/logging/LogReader.java
@@ -30,14 +30,11 @@
import org.apache.asterix.common.transactions.LogRecord;
import org.apache.asterix.common.transactions.MutableLong;
import org.apache.asterix.common.transactions.TxnLogFile;
+import org.apache.hyracks.util.annotations.NotThreadSafe;
-/**
- * NOTE: Many method calls of this class are not thread safe.
- * Be very cautious using it in a multithreaded context.
- */
+@NotThreadSafe
public class LogReader implements ILogReader {
- public static final boolean IS_DEBUG_MODE = false;//true
private static final Logger LOGGER = Logger.getLogger(LogReader.class.getName());
private final ILogManager logMgr;
private final long logFileSize;
@@ -54,7 +51,7 @@
private enum ReturnState {
FLUSH,
EOF
- };
+ }
public LogReader(ILogManager logMgr, long logFileSize, int logPageSize, MutableLong flushLSN,
boolean isRecoveryMode) {
@@ -68,8 +65,8 @@
}
@Override
- public void initializeScan(long beginLSN) throws ACIDException {
- readLSN = beginLSN;
+ public void setPosition(long lsn) {
+ readLSN = lsn;
if (waitForFlushOrReturnIfEOF() == ReturnState.EOF) {
return;
}
@@ -84,7 +81,7 @@
* @throws ACIDException
*/
@Override
- public ILogRecord next() throws ACIDException {
+ public ILogRecord next() {
if (waitForFlushOrReturnIfEOF() == ReturnState.EOF) {
return null;
}
@@ -147,13 +144,10 @@
return ReturnState.EOF;
}
try {
- if (IS_DEBUG_MODE) {
- LOGGER.info(
- "waitForFlushOrReturnIfEOF()| flushLSN: " + flushLSN.get() + ", readLSN: " + readLSN);
- }
flushLSN.wait();
} catch (InterruptedException e) {
- //ignore
+ Thread.currentThread().interrupt();
+ throw new ACIDException(e);
}
}
return ReturnState.FLUSH;
@@ -166,10 +160,9 @@
* @return true if log continues, false if EOF
* @throws ACIDException
*/
- private boolean refillLogReadBuffer() throws ACIDException {
+ private boolean refillLogReadBuffer() {
try {
if (readLSN % logFileSize == logFile.size()) {
- logFile.close();
readLSN += logFileSize - (readLSN % logFileSize);
getLogFile();
}
@@ -183,14 +176,12 @@
* Fills the log buffer with data from the log file at the current position
*
* @return false if EOF, true otherwise
- * @throws ACIDException
*/
-
- private boolean fillLogReadBuffer() throws ACIDException {
+ private boolean fillLogReadBuffer() {
return fillLogReadBuffer(logPageSize, readBuffer);
}
- private boolean fillLogReadBuffer(int readSize, ByteBuffer readBuffer) throws ACIDException {
+ private boolean fillLogReadBuffer(int readSize, ByteBuffer readBuffer) {
int size = 0;
int read = 0;
readBuffer.position(0);
@@ -217,10 +208,9 @@
return true;
}
- //for random reading
@Override
- public ILogRecord read(long LSN) throws ACIDException {
- readLSN = LSN;
+ public ILogRecord read(long lsn) {
+ readLSN = lsn;
//wait for the log to be flushed if needed before trying to read it.
synchronized (flushLSN) {
while (readLSN >= flushLSN.get()) {
@@ -232,15 +222,10 @@
}
}
try {
- if (logFile == null) {
+ if (logFile == null || readLSN < fileBeginLSN || readLSN >= fileBeginLSN + logFile.size()) {
//get the log file which contains readLSN
getLogFile();
fillLogReadBuffer();
- } else if (readLSN < fileBeginLSN || readLSN >= fileBeginLSN + logFile.size()) {
- //log is not in the current log file
- logFile.close();
- getLogFile();
- fillLogReadBuffer();
} else if (readLSN < bufferBeginLSN || readLSN >= bufferBeginLSN + readBuffer.limit()) {
//log is not in the current read buffer
fillLogReadBuffer();
@@ -265,7 +250,7 @@
case TRUNCATED: {
if (!fillLogReadBuffer()) {
throw new IllegalStateException(
- "Could not read LSN(" + LSN + ") from log file id " + logFile.getLogFileId());
+ "Could not read LSN(" + lsn + ") from log file id " + logFile.getLogFileId());
}
//now read the complete log record
continue;
@@ -285,8 +270,10 @@
return logRecord;
}
- private void getLogFile() throws ACIDException {
+ private void getLogFile() {
try {
+ // close existing file (if any) before opening another one
+ close();
logFile = logMgr.getLogFile(readLSN);
fileBeginLSN = logFile.getFileBeginLSN();
} catch (IOException e) {
@@ -295,10 +282,11 @@
}
@Override
- public void close() throws ACIDException {
+ public void close() {
try {
if (logFile != null) {
logFile.close();
+ logFile = null;
}
} catch (IOException e) {
throw new ACIDException(e);
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java
index 36a91dc..aad2a19 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/AbstractCheckpointManager.java
@@ -174,7 +174,7 @@
protected void capture(long minMCTFirstLSN, boolean sharp) throws HyracksDataException {
ILogManager logMgr = txnSubsystem.getLogManager();
ITransactionManager txnMgr = txnSubsystem.getTransactionManager();
- Checkpoint checkpointObject = new Checkpoint(logMgr.getAppendLSN(), minMCTFirstLSN, txnMgr.getMaxJobId(),
+ Checkpoint checkpointObject = new Checkpoint(logMgr.getAppendLSN(), minMCTFirstLSN, txnMgr.getMaxTxnId(),
System.currentTimeMillis(), sharp, StorageConstants.VERSION);
persist(checkpointObject);
cleanup();
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/TxnId.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/TxnEntityId.java
similarity index 66%
rename from asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/TxnId.java
rename to asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/TxnEntityId.java
index 9cb54af..af74b13 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/TxnId.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/recovery/TxnEntityId.java
@@ -21,22 +21,22 @@
import java.nio.ByteBuffer;
import org.apache.asterix.common.transactions.ILogRecord;
-import org.apache.asterix.common.transactions.JobId;
import org.apache.asterix.common.transactions.LogRecord;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
-public class TxnId {
+public class TxnEntityId {
public boolean isByteArrayPKValue;
- public int jobId;
+ public long txnId;
public int datasetId;
public int pkHashValue;
public int pkSize;
public byte[] byteArrayPKValue;
public ITupleReference tupleReferencePKValue;
- public TxnId(int jobId, int datasetId, int pkHashValue, ITupleReference pkValue, int pkSize,
+ public TxnEntityId(long txnId, int datasetId, int pkHashValue, ITupleReference pkValue, int pkSize,
boolean isByteArrayPKValue) {
- this.jobId = jobId;
+ this.txnId = txnId;
this.datasetId = datasetId;
this.pkHashValue = pkHashValue;
this.pkSize = pkSize;
@@ -49,7 +49,7 @@
}
}
- public TxnId() {
+ public TxnEntityId() {
}
private static void readPKValueIntoByteArray(ITupleReference pkValue, int pkSize, byte[] byteArrayPKValue) {
@@ -60,8 +60,8 @@
}
}
- public void setTxnId(int jobId, int datasetId, int pkHashValue, ITupleReference pkValue, int pkSize) {
- this.jobId = jobId;
+ public void setTxnId(long txnId, int datasetId, int pkHashValue, ITupleReference pkValue, int pkSize) {
+ this.txnId = txnId;
this.datasetId = datasetId;
this.pkHashValue = pkHashValue;
this.tupleReferencePKValue = pkValue;
@@ -71,7 +71,7 @@
@Override
public String toString() {
- return "[" + jobId + "," + datasetId + "," + pkHashValue + "," + pkSize + "]";
+ return "[" + txnId + "," + datasetId + "," + pkHashValue + "," + pkSize + "]";
}
@Override
@@ -84,23 +84,23 @@
if (o == this) {
return true;
}
- if (!(o instanceof TxnId)) {
+ if (!(o instanceof TxnEntityId)) {
return false;
}
- TxnId txnId = (TxnId) o;
- return (txnId.pkHashValue == pkHashValue && txnId.datasetId == datasetId && txnId.jobId == jobId
- && pkSize == txnId.pkSize && isEqualTo(txnId));
+ TxnEntityId txnEntityId = (TxnEntityId) o;
+ return (txnEntityId.pkHashValue == pkHashValue && txnEntityId.datasetId == datasetId
+ && txnEntityId.txnId == txnId && pkSize == txnEntityId.pkSize && isEqualTo(txnEntityId));
}
- private boolean isEqualTo(TxnId txnId) {
- if (isByteArrayPKValue && txnId.isByteArrayPKValue) {
- return isEqual(byteArrayPKValue, txnId.byteArrayPKValue, pkSize);
- } else if (isByteArrayPKValue && (!txnId.isByteArrayPKValue)) {
- return isEqual(byteArrayPKValue, txnId.tupleReferencePKValue, pkSize);
- } else if ((!isByteArrayPKValue) && txnId.isByteArrayPKValue) {
- return isEqual(txnId.byteArrayPKValue, tupleReferencePKValue, pkSize);
+ private boolean isEqualTo(TxnEntityId txnEntityId) {
+ if (isByteArrayPKValue && txnEntityId.isByteArrayPKValue) {
+ return isEqual(byteArrayPKValue, txnEntityId.byteArrayPKValue, pkSize);
+ } else if (isByteArrayPKValue && (!txnEntityId.isByteArrayPKValue)) {
+ return isEqual(byteArrayPKValue, txnEntityId.tupleReferencePKValue, pkSize);
+ } else if ((!isByteArrayPKValue) && txnEntityId.isByteArrayPKValue) {
+ return isEqual(txnEntityId.byteArrayPKValue, tupleReferencePKValue, pkSize);
} else {
- return isEqual(tupleReferencePKValue, txnId.tupleReferencePKValue, pkSize);
+ return isEqual(tupleReferencePKValue, txnEntityId.tupleReferencePKValue, pkSize);
}
}
@@ -138,7 +138,7 @@
}
public void serialize(ByteBuffer buffer) {
- buffer.putInt(jobId);
+ buffer.putLong(txnId);
buffer.putInt(datasetId);
buffer.putInt(pkHashValue);
buffer.putInt(pkSize);
@@ -148,24 +148,24 @@
}
}
- public static TxnId deserialize(ByteBuffer buffer) {
- TxnId txnId = new TxnId();
- txnId.jobId = buffer.getInt();
- txnId.datasetId = buffer.getInt();
- txnId.pkHashValue = buffer.getInt();
- txnId.pkSize = buffer.getInt();
- txnId.isByteArrayPKValue = (buffer.get() == 1);
- if (txnId.isByteArrayPKValue) {
- byte[] byteArrayPKValue = new byte[txnId.pkSize];
+ public static TxnEntityId deserialize(ByteBuffer buffer) {
+ TxnEntityId txnEntityId = new TxnEntityId();
+ txnEntityId.txnId = buffer.getLong();
+ txnEntityId.datasetId = buffer.getInt();
+ txnEntityId.pkHashValue = buffer.getInt();
+ txnEntityId.pkSize = buffer.getInt();
+ txnEntityId.isByteArrayPKValue = (buffer.get() == 1);
+ if (txnEntityId.isByteArrayPKValue) {
+ byte[] byteArrayPKValue = new byte[txnEntityId.pkSize];
buffer.get(byteArrayPKValue);
- txnId.byteArrayPKValue = byteArrayPKValue;
+ txnEntityId.byteArrayPKValue = byteArrayPKValue;
}
- return txnId;
+ return txnEntityId;
}
public int getCurrentSize() {
- //job id, dataset id, pkHashValue, arraySize, isByteArrayPKValue
- int size = JobId.BYTES + ILogRecord.DS_LEN + LogRecord.PKHASH_LEN + LogRecord.PKSZ_LEN + Byte.BYTES;
+ //txn id, dataset id, pkHashValue, arraySize, isByteArrayPKValue
+ int size = TxnId.BYTES + ILogRecord.DS_LEN + LogRecord.PKHASH_LEN + LogRecord.PKSZ_LEN + Byte.BYTES;
//byte arraySize
if (isByteArrayPKValue && byteArrayPKValue != null) {
size += byteArrayPKValue.length;
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/AbstractTransactionContext.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/AbstractTransactionContext.java
new file mode 100644
index 0000000..43fe266
--- /dev/null
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/AbstractTransactionContext.java
@@ -0,0 +1,145 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.transaction.management.service.transaction;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
+import org.apache.asterix.common.context.ITransactionOperationTracker;
+import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.ITransactionManager;
+import org.apache.asterix.common.transactions.TxnId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+import org.apache.hyracks.util.annotations.ThreadSafe;
+
+@ThreadSafe
+public abstract class AbstractTransactionContext implements ITransactionContext {
+
+ protected final TxnId txnId;
+ protected final Map<Long, ITransactionOperationTracker> txnOpTrackers;
+ private final AtomicLong firstLSN;
+ private final AtomicLong lastLSN;
+ private final AtomicInteger txnState;
+ private final AtomicBoolean isWriteTxn;
+ private boolean isTimeout = false;
+
+ protected AbstractTransactionContext(TxnId txnId) {
+ this.txnId = txnId;
+ firstLSN = new AtomicLong(-1);
+ lastLSN = new AtomicLong(-1);
+ txnState = new AtomicInteger(ITransactionManager.ACTIVE);
+ isTimeout = false;
+ isWriteTxn = new AtomicBoolean();
+ txnOpTrackers = new HashMap<>();
+ }
+
+ @Override
+ public long getFirstLSN() {
+ return firstLSN.get();
+ }
+
+ @Override
+ public void setLastLSN(long newValue) {
+ firstLSN.compareAndSet(-1, newValue);
+ lastLSN.set(Math.max(lastLSN.get(), newValue));
+ }
+
+ @Override
+ public void setTxnState(int txnState) {
+ this.txnState.set(txnState);
+ }
+
+ @Override
+ public int getTxnState() {
+ return txnState.get();
+ }
+
+ @Override
+ public TxnId getTxnId() {
+ return txnId;
+ }
+
+ @Override
+ public synchronized void setTimeout(boolean isTimeout) {
+ this.isTimeout = isTimeout;
+ }
+
+ @Override
+ public synchronized boolean isTimeout() {
+ return isTimeout;
+ }
+
+ @Override
+ public void setWriteTxn(boolean isWriteTxn) {
+ this.isWriteTxn.set(isWriteTxn);
+ }
+
+ @Override
+ public boolean isWriteTxn() {
+ return isWriteTxn.get();
+ }
+
+ @Override
+ public long getLastLSN() {
+ return lastLSN.get();
+ }
+
+ @Override
+ public void complete() {
+ try {
+ if (txnState.get() == ITransactionManager.ABORTED) {
+ cleanupForAbort();
+ }
+ } finally {
+ synchronized (txnOpTrackers) {
+ txnOpTrackers.forEach((resource, opTracker) -> opTracker.afterTransaction(resource));
+ }
+ }
+ }
+
+ @Override
+ public void register(long resourceId, ILSMIndex index, IModificationOperationCallback callback,
+ boolean primaryIndex) {
+ synchronized (txnOpTrackers) {
+ if (!txnOpTrackers.containsKey(resourceId)) {
+ final ITransactionOperationTracker txnOpTracker =
+ (ITransactionOperationTracker) index.getOperationTracker();
+ txnOpTrackers.put(resourceId, txnOpTracker);
+ txnOpTracker.beforeTransaction(resourceId);
+ }
+ }
+ }
+
+ public String prettyPrint() {
+ StringBuilder sb = new StringBuilder();
+ sb.append("\n" + txnId + "\n");
+ sb.append("isWriteTxn: " + isWriteTxn + "\n");
+ sb.append("firstLSN: " + firstLSN.get() + "\n");
+ sb.append("lastLSN: " + lastLSN.get() + "\n");
+ sb.append("TransactionState: " + txnState + "\n");
+ sb.append("isTimeout: " + isTimeout + "\n");
+ return sb.toString();
+ }
+
+ protected abstract void cleanupForAbort();
+}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/AtomicTransactionContext.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/AtomicTransactionContext.java
new file mode 100644
index 0000000..1d132a8
--- /dev/null
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/AtomicTransactionContext.java
@@ -0,0 +1,107 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.transaction.management.service.transaction;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.asterix.common.context.PrimaryIndexOperationTracker;
+import org.apache.asterix.common.exceptions.ACIDException;
+import org.apache.asterix.common.transactions.TxnId;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
+import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+import org.apache.hyracks.util.annotations.ThreadSafe;
+
+@ThreadSafe
+public class AtomicTransactionContext extends AbstractTransactionContext {
+
+ private final Map<Long, ILSMOperationTracker> opTrackers = new HashMap<>();
+ private final Map<Long, AtomicInteger> indexPendingOps = new HashMap<>();
+ private final Map<Long, IModificationOperationCallback> callbacks = new HashMap<>();
+
+ public AtomicTransactionContext(TxnId txnId) {
+ super(txnId);
+ }
+
+ @Override
+ public void register(long resourceId, ILSMIndex index, IModificationOperationCallback callback,
+ boolean primaryIndex) {
+ super.register(resourceId, index, callback, primaryIndex);
+ synchronized (txnOpTrackers) {
+ if (primaryIndex && !opTrackers.containsKey(resourceId)) {
+ opTrackers.put(resourceId, index.getOperationTracker());
+ callbacks.put(resourceId, callback);
+ indexPendingOps.put(resourceId, new AtomicInteger(0));
+ }
+ }
+ }
+
+ @Override
+ public void notifyUpdateCommitted(long resourceId) {
+ try {
+ opTrackers.get(resourceId).completeOperation(null, LSMOperationType.MODIFICATION, null,
+ callbacks.get(resourceId));
+ } catch (HyracksDataException e) {
+ throw new ACIDException(e);
+ }
+ }
+
+ @Override
+ public void notifyEntityCommitted() {
+ throw new IllegalStateException("Unexpected entity commit in atomic transaction");
+ }
+
+ @Override
+ public void beforeOperation(long resourceId) {
+ indexPendingOps.get(resourceId).incrementAndGet();
+ }
+
+ @Override
+ public void afterOperation(long resourceId) {
+ indexPendingOps.get(resourceId).decrementAndGet();
+ }
+
+ @Override
+ public void cleanupForAbort() {
+ // each opTracker should be cleaned
+ opTrackers.forEach((resId, opTracker) -> ((PrimaryIndexOperationTracker) opTracker)
+ .cleanupNumActiveOperationsForAbortedJob(indexPendingOps.get(resId).get()));
+ }
+
+ @Override
+ public int hashCode() {
+ return Long.hashCode(txnId.getId());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ AtomicTransactionContext that = (AtomicTransactionContext) o;
+ return this.txnId.equals(that.txnId);
+ }
+}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java
index 7acefe9..ffc0268 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/DatasetIdFactory.java
@@ -20,6 +20,7 @@
import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.exceptions.ErrorCode;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
public class DatasetIdFactory {
private static int id = 0;
@@ -34,7 +35,7 @@
isInitialized = true;
}
- public static synchronized int generateDatasetId() throws AsterixException {
+ public static synchronized int generateDatasetId() throws AlgebricksException {
if (id == Integer.MAX_VALUE) {
throw new AsterixException(ErrorCode.DATASET_ID_EXHAUSTED);
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/EntityLevelTransactionContext.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/EntityLevelTransactionContext.java
new file mode 100644
index 0000000..e195451
--- /dev/null
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/EntityLevelTransactionContext.java
@@ -0,0 +1,103 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.transaction.management.service.transaction;
+
+import java.util.concurrent.atomic.AtomicInteger;
+
+import org.apache.asterix.common.context.PrimaryIndexOperationTracker;
+import org.apache.asterix.common.exceptions.ACIDException;
+import org.apache.asterix.common.transactions.TxnId;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+import org.apache.hyracks.util.annotations.ThreadSafe;
+
+@ThreadSafe
+public class EntityLevelTransactionContext extends AbstractTransactionContext {
+
+ private PrimaryIndexOperationTracker primaryIndexOpTracker;
+ private IModificationOperationCallback primaryIndexCallback;
+ private final AtomicInteger pendingOps;
+
+ public EntityLevelTransactionContext(TxnId txnId) {
+ super(txnId);
+ pendingOps = new AtomicInteger(0);
+ }
+
+ @Override
+ public void register(long resourceId, ILSMIndex index, IModificationOperationCallback callback,
+ boolean primaryIndex) {
+ super.register(resourceId, index, callback, primaryIndex);
+ synchronized (txnOpTrackers) {
+ if (primaryIndex && primaryIndexOpTracker == null) {
+ primaryIndexCallback = callback;
+ primaryIndexOpTracker = (PrimaryIndexOperationTracker) index.getOperationTracker();
+ }
+ }
+ }
+
+ @Override
+ public void beforeOperation(long resourceId) {
+ pendingOps.incrementAndGet();
+ }
+
+ @Override
+ public void notifyUpdateCommitted(long resourceId) {
+ // no op
+ }
+
+ @Override
+ public void notifyEntityCommitted() {
+ try {
+ primaryIndexOpTracker.completeOperation(null, LSMOperationType.MODIFICATION, null, primaryIndexCallback);
+ } catch (HyracksDataException e) {
+ throw new ACIDException(e);
+ }
+ }
+
+ @Override
+ public void afterOperation(long resourceId) {
+ pendingOps.decrementAndGet();
+ }
+
+ @Override
+ protected void cleanupForAbort() {
+ if (primaryIndexOpTracker != null) {
+ primaryIndexOpTracker.cleanupNumActiveOperationsForAbortedJob(pendingOps.get());
+ }
+ }
+
+ @Override
+ public int hashCode() {
+ return Long.hashCode(txnId.getId());
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) {
+ return true;
+ }
+ if (o == null || getClass() != o.getClass()) {
+ return false;
+ }
+ EntityLevelTransactionContext that = (EntityLevelTransactionContext) o;
+ return this.txnId.equals(that.txnId);
+ }
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/FieldsHashValueGenerator.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/FieldsHashValueGenerator.java
deleted file mode 100644
index c408f1d..0000000
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/FieldsHashValueGenerator.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.asterix.transaction.management.service.transaction;
-
-import org.apache.hyracks.api.dataflow.value.IBinaryHashFunction;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
-
-public class FieldsHashValueGenerator {
- public static int computeFieldsHashValue(ITupleReference tuple, int[] fieldIndexes,
- IBinaryHashFunction[] fieldHashFunctions) throws HyracksDataException {
- int h = 0;
- for (int i = 0; i < fieldIndexes.length; i++) {
- int primaryKeyFieldIdx = fieldIndexes[i];
- int fh = fieldHashFunctions[i].hash(tuple.getFieldData(primaryKeyFieldIdx),
- tuple.getFieldStart(primaryKeyFieldIdx), tuple.getFieldLength(primaryKeyFieldIdx));
- h = h * 31 + fh;
- if (h < 0) {
- h = h * (-1);
- }
- }
- return h;
- }
-}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/MutableResourceId.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/MutableResourceId.java
deleted file mode 100644
index c8e134c..0000000
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/MutableResourceId.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.transaction.management.service.transaction;
-
-public class MutableResourceId {
- long id;
-
- public MutableResourceId(long id) {
- this.id = id;
- }
-
- public void setId(long id) {
- this.id = id;
- }
-
- public long getId() {
- return id;
- }
-
- @Override
- public int hashCode() {
- return (int) id;
- }
-
- @Override
- public boolean equals(Object o) {
- if ((o == null) || !(o instanceof MutableResourceId)) {
- return false;
- }
- return ((MutableResourceId) o).id == this.id;
- }
-}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java
deleted file mode 100644
index eb37f22..0000000
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContext.java
+++ /dev/null
@@ -1,261 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.asterix.transaction.management.service.transaction;
-
-import java.io.Serializable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
-import org.apache.asterix.common.context.PrimaryIndexOperationTracker;
-import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.ioopcallbacks.AbstractLSMIOOperationCallback;
-import org.apache.asterix.common.transactions.AbstractOperationCallback;
-import org.apache.asterix.common.transactions.ITransactionContext;
-import org.apache.asterix.common.transactions.ITransactionManager;
-import org.apache.asterix.common.transactions.JobId;
-import org.apache.asterix.common.transactions.LogRecord;
-import org.apache.asterix.common.transactions.MutableLong;
-import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-
-/*
- * An object of TransactionContext is created and accessed(read/written) by multiple threads which work for
- * a single job identified by a jobId. Thus, the member variables in the object can be read/written
- * concurrently. Please see each variable declaration to know which one is accessed concurrently and
- * which one is not.
- */
-public class TransactionContext implements ITransactionContext, Serializable {
-
- private static final long serialVersionUID = -6105616785783310111L;
-
- // jobId is set once and read concurrently.
- private final JobId jobId;
-
- // There are no concurrent writers on both firstLSN and lastLSN
- // since both values are updated by serialized log appenders.
- // But readers and writers can be different threads,
- // so both LSNs are atomic variables in order to be read and written
- // atomically.
- private final AtomicLong firstLSN;
- private final AtomicLong lastLSN;
-
- // txnState is read and written concurrently.
- private final AtomicInteger txnState;
-
- // isTimeout is read and written under the lockMgr's tableLatch
- // Thus, no other synchronization is required separately.
- private boolean isTimeout;
-
- // isWriteTxn can be set concurrently by multiple threads.
- private final AtomicBoolean isWriteTxn;
-
- // isMetadataTxn is accessed by a single thread since the metadata is not
- // partitioned
- private boolean isMetadataTxn;
-
- // indexMap is concurrently accessed by multiple threads,
- // so those threads are synchronized on indexMap object itself
- private final Map<MutableLong, AbstractLSMIOOperationCallback> indexMap;
-
- // TODO: fix ComponentLSNs' issues.
- // primaryIndex, primaryIndexCallback, and primaryIndexOptracker will be
- // modified accordingly
- // when the issues of componentLSNs are fixed.
- private ILSMIndex primaryIndex;
- private AbstractOperationCallback primaryIndexCallback;
- private PrimaryIndexOperationTracker primaryIndexOpTracker;
-
- // The following three variables are used as temporary variables in order to
- // avoid object creations.
- // Those are used in synchronized methods.
- private final MutableLong tempResourceIdForRegister;
- private final LogRecord logRecord;
-
- private final AtomicInteger transactorNumActiveOperations;
-
- // TODO: implement transactionContext pool in order to avoid object
- // creations.
- // also, the pool can throttle the number of concurrent active jobs at every
- // moment.
- public TransactionContext(JobId jobId) throws ACIDException {
- this.jobId = jobId;
- firstLSN = new AtomicLong(-1);
- lastLSN = new AtomicLong(-1);
- txnState = new AtomicInteger(ITransactionManager.ACTIVE);
- isTimeout = false;
- isWriteTxn = new AtomicBoolean(false);
- isMetadataTxn = false;
- indexMap = new HashMap<>();
- primaryIndex = null;
- tempResourceIdForRegister = new MutableLong();
- logRecord = new LogRecord();
- transactorNumActiveOperations = new AtomicInteger(0);
- }
-
- @Override
- public void registerIndexAndCallback(long resourceId, ILSMIndex index, AbstractOperationCallback callback,
- boolean isPrimaryIndex) {
- synchronized (indexMap) {
- if (isPrimaryIndex && primaryIndex == null) {
- primaryIndex = index;
- primaryIndexCallback = callback;
- primaryIndexOpTracker = (PrimaryIndexOperationTracker) index.getOperationTracker();
- }
- tempResourceIdForRegister.set(resourceId);
- if (!indexMap.containsKey(tempResourceIdForRegister)) {
- indexMap.put(new MutableLong(resourceId),
- ((AbstractLSMIOOperationCallback) index.getIOOperationCallback()));
- }
- }
- }
-
- public PrimaryIndexOperationTracker getPrimaryIndexOpTracker() {
- synchronized (indexMap) {
- return primaryIndexOpTracker;
- }
- }
-
- // [Notice]
- // This method is called sequentially by the LogAppender threads.
- @Override
- public void setLastLSN(long LSN) {
- firstLSN.compareAndSet(-1, LSN);
- lastLSN.set(Math.max(lastLSN.get(), LSN));
- }
-
- @Override
- public void notifyOptracker(boolean isJobLevelCommit) {
- try {
- /**
- * in case of transaction abort {@link TransactionContext#cleanupForAbort()} will
- * clean the primaryIndexOpTracker state.
- */
- if (isJobLevelCommit && isMetadataTxn && txnState.get() != ITransactionManager.ABORTED) {
- primaryIndexOpTracker.exclusiveJobCommitted();
- } else if (!isJobLevelCommit) {
- primaryIndexOpTracker.completeOperation(null, LSMOperationType.MODIFICATION, null,
- (IModificationOperationCallback) primaryIndexCallback);
- }
- } catch (HyracksDataException e) {
- throw new IllegalStateException(e);
- }
- }
-
- @Override
- public void setWriteTxn(boolean isWriteTxn) {
- this.isWriteTxn.set(isWriteTxn);
- }
-
- @Override
- public boolean isWriteTxn() {
- return isWriteTxn.get();
- }
-
- @Override
- public long getFirstLSN() {
- return firstLSN.get();
- }
-
- @Override
- public long getLastLSN() {
- return lastLSN.get();
- }
-
- @Override
- public JobId getJobId() {
- return jobId;
- }
-
- @Override
- public void setTimeout(boolean isTimeout) {
- this.isTimeout = isTimeout;
- }
-
- @Override
- public boolean isTimeout() {
- return isTimeout;
- }
-
- @Override
- public void setTxnState(int txnState) {
- this.txnState.set(txnState);
- }
-
- @Override
- public int getTxnState() {
- return txnState.get();
- }
-
- @Override
- public int hashCode() {
- return jobId.getId();
- }
-
- @Override
- public boolean equals(Object o) {
- return (o == this);
- }
-
- @Override
- public void setMetadataTransaction(boolean isMetadataTxn) {
- this.isMetadataTxn = isMetadataTxn;
- }
-
- @Override
- public boolean isMetadataTransaction() {
- return isMetadataTxn;
- }
-
- @Override
- public String prettyPrint() {
- StringBuilder sb = new StringBuilder();
- sb.append("\n" + jobId + "\n");
- sb.append("isWriteTxn: " + isWriteTxn + "\n");
- sb.append("firstLSN: " + firstLSN.get() + "\n");
- sb.append("lastLSN: " + lastLSN.get() + "\n");
- sb.append("TransactionState: " + txnState + "\n");
- sb.append("isTimeout: " + isTimeout + "\n");
- return sb.toString();
- }
-
- public LogRecord getLogRecord() {
- return logRecord;
- }
-
- public void cleanupForAbort() {
- if (primaryIndexOpTracker != null) {
- primaryIndexOpTracker.cleanupNumActiveOperationsForAbortedJob(transactorNumActiveOperations.get());
- }
- }
-
- @Override
- public void incrementNumActiveOperations() {
- transactorNumActiveOperations.incrementAndGet();
- }
-
- @Override
- public void decrementNumActiveOperations() {
- transactorNumActiveOperations.decrementAndGet();
- }
-}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContextFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContextFactory.java
new file mode 100644
index 0000000..4a465a4
--- /dev/null
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionContextFactory.java
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.asterix.transaction.management.service.transaction;
+
+import static org.apache.asterix.common.transactions.ITransactionManager.AtomicityLevel;
+
+import org.apache.asterix.common.transactions.ITransactionContext;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.common.transactions.TxnId;
+
+public class TransactionContextFactory {
+
+ private TransactionContextFactory() {
+ }
+
+ public static ITransactionContext create(TxnId txnId, TransactionOptions options) {
+ final AtomicityLevel atomicityLevel = options.getAtomicityLevel();
+ switch (atomicityLevel) {
+ case ATOMIC:
+ return new AtomicTransactionContext(txnId);
+ case ENTITY_LEVEL:
+ return new EntityLevelTransactionContext(txnId);
+ default:
+ throw new IllegalStateException("Unknown transaction context type: " + atomicityLevel);
+ }
+ }
+}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionManager.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionManager.java
index 3e79e1d..6b414b8 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionManager.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TransactionManager.java
@@ -18,138 +18,109 @@
*/
package org.apache.asterix.transaction.management.service.transaction;
+import java.io.IOException;
import java.io.OutputStream;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.asterix.common.exceptions.ACIDException;
-import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ITransactionContext;
import org.apache.asterix.common.transactions.ITransactionManager;
import org.apache.asterix.common.transactions.ITransactionSubsystem;
-import org.apache.asterix.common.transactions.JobId;
import org.apache.asterix.common.transactions.LogRecord;
+import org.apache.asterix.common.transactions.TransactionOptions;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.common.utils.TransactionUtil;
import org.apache.hyracks.api.lifecycle.ILifeCycleComponent;
+import org.apache.hyracks.util.annotations.ThreadSafe;
-/**
- * An implementation of the @see ITransactionManager interface that provides
- * implementation of APIs for governing the lifecycle of a transaction.
- */
+@ThreadSafe
public class TransactionManager implements ITransactionManager, ILifeCycleComponent {
- public static final boolean IS_DEBUG_MODE = false;//true
private static final Logger LOGGER = Logger.getLogger(TransactionManager.class.getName());
private final ITransactionSubsystem txnSubsystem;
- private Map<JobId, ITransactionContext> transactionContextRepository = new ConcurrentHashMap<>();
- private AtomicInteger maxJobId = new AtomicInteger(0);
+ private final Map<TxnId, ITransactionContext> txnCtxRepository = new ConcurrentHashMap<>();
+ private final AtomicLong maxTxnId = new AtomicLong(0);
public TransactionManager(ITransactionSubsystem provider) {
this.txnSubsystem = provider;
}
@Override
- public void abortTransaction(ITransactionContext txnCtx, DatasetId datasetId, int PKHashVal) throws ACIDException {
- if (txnCtx.getTxnState() != ITransactionManager.ABORTED) {
- txnCtx.setTxnState(ITransactionManager.ABORTED);
+ public synchronized ITransactionContext beginTransaction(TxnId txnId, TransactionOptions options)
+ throws ACIDException {
+ ITransactionContext txnCtx = txnCtxRepository.get(txnId);
+ if (txnCtx != null) {
+ throw new ACIDException("Transaction with the same (" + txnId + ") already exists");
}
- try {
- if (txnCtx.isWriteTxn()) {
- LogRecord logRecord = ((TransactionContext) txnCtx).getLogRecord();
- TransactionUtil.formJobTerminateLogRecord(txnCtx, logRecord, false);
- txnSubsystem.getLogManager().log(logRecord);
- txnSubsystem.getRecoveryManager().rollbackTransaction(txnCtx);
- }
- } catch (Exception ae) {
- String msg = "Could not complete rollback! System is in an inconsistent state";
- if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.severe(msg);
- }
- ae.printStackTrace();
- throw new ACIDException(msg, ae);
- } finally {
- ((TransactionContext) txnCtx).cleanupForAbort();
- txnSubsystem.getLockManager().releaseLocks(txnCtx);
- transactionContextRepository.remove(txnCtx.getJobId());
- }
+ txnCtx = TransactionContextFactory.create(txnId, options);
+ txnCtxRepository.put(txnId, txnCtx);
+ ensureMaxTxnId(txnId.getId());
+ return txnCtx;
}
@Override
- public ITransactionContext beginTransaction(JobId jobId) throws ACIDException {
- return getTransactionContext(jobId, true);
- }
-
- @Override
- public ITransactionContext getTransactionContext(JobId jobId, boolean createIfNotExist) throws ACIDException {
- setMaxJobId(jobId.getId());
- ITransactionContext txnCtx = transactionContextRepository.get(jobId);
+ public ITransactionContext getTransactionContext(TxnId txnId) throws ACIDException {
+ ITransactionContext txnCtx = txnCtxRepository.get(txnId);
if (txnCtx == null) {
- if (createIfNotExist) {
- synchronized (this) {
- txnCtx = transactionContextRepository.get(jobId);
- if (txnCtx == null) {
- txnCtx = new TransactionContext(jobId);
- transactionContextRepository.put(jobId, txnCtx);
- }
- }
- } else {
- throw new ACIDException("TransactionContext of " + jobId + " doesn't exist.");
- }
+ throw new ACIDException("Transaction " + txnId + " doesn't exist.");
}
return txnCtx;
}
@Override
- public void commitTransaction(ITransactionContext txnCtx, DatasetId datasetId, int PKHashVal)
- throws ACIDException {
- //Only job-level commits call this method.
+ public void commitTransaction(TxnId txnId) throws ACIDException {
+ final ITransactionContext txnCtx = getTransactionContext(txnId);
try {
if (txnCtx.isWriteTxn()) {
- LogRecord logRecord = ((TransactionContext) txnCtx).getLogRecord();
+ LogRecord logRecord = new LogRecord();
TransactionUtil.formJobTerminateLogRecord(txnCtx, logRecord, true);
txnSubsystem.getLogManager().log(logRecord);
+ txnCtx.setTxnState(ITransactionManager.COMMITTED);
}
- } catch (Exception ae) {
+ } catch (Exception e) {
if (LOGGER.isLoggable(Level.SEVERE)) {
- LOGGER.severe(" caused exception in commit !" + txnCtx.getJobId());
+ LOGGER.severe(" caused exception in commit !" + txnCtx.getTxnId());
}
- throw ae;
+ throw e;
} finally {
+ txnCtx.complete();
txnSubsystem.getLockManager().releaseLocks(txnCtx);
- transactionContextRepository.remove(txnCtx.getJobId());
- txnCtx.setTxnState(ITransactionManager.COMMITTED);
+ txnCtxRepository.remove(txnCtx.getTxnId());
}
}
@Override
- public void completedTransaction(ITransactionContext txnContext, DatasetId datasetId, int PKHashVal,
- boolean success) throws ACIDException {
- if (!success) {
- abortTransaction(txnContext, datasetId, PKHashVal);
- } else {
- commitTransaction(txnContext, datasetId, PKHashVal);
+ public void abortTransaction(TxnId txnId) throws ACIDException {
+ final ITransactionContext txnCtx = getTransactionContext(txnId);
+ try {
+ if (txnCtx.isWriteTxn()) {
+ LogRecord logRecord = new LogRecord();
+ TransactionUtil.formJobTerminateLogRecord(txnCtx, logRecord, false);
+ txnSubsystem.getLogManager().log(logRecord);
+ txnSubsystem.getRecoveryManager().rollbackTransaction(txnCtx);
+ txnCtx.setTxnState(ITransactionManager.ABORTED);
+ }
+ } catch (ACIDException e) {
+ String msg = "Could not complete rollback! System is in an inconsistent state";
+ if (LOGGER.isLoggable(Level.SEVERE)) {
+ LOGGER.log(Level.SEVERE, msg, e);
+ }
+ throw new ACIDException(msg, e);
+ } finally {
+ txnCtx.complete();
+ txnSubsystem.getLockManager().releaseLocks(txnCtx);
+ txnCtxRepository.remove(txnCtx.getTxnId());
}
}
@Override
- public ITransactionSubsystem getTransactionSubsystem() {
- return txnSubsystem;
- }
-
- public void setMaxJobId(int jobId) {
- int maxId = maxJobId.get();
- if (jobId > maxId) {
- maxJobId.compareAndSet(maxId, jobId);
- }
- }
-
- @Override
- public int getMaxJobId() {
- return maxJobId.get();
+ public long getMaxTxnId() {
+ return maxTxnId.get();
}
@Override
@@ -166,45 +137,42 @@
@Override
public void dumpState(OutputStream os) {
- //#. dump TxnContext
dumpTxnContext(os);
}
+ @Override
+ public void ensureMaxTxnId(long txnId) {
+ maxTxnId.updateAndGet(current -> Math.max(current, txnId));
+ }
+
private void dumpTxnContext(OutputStream os) {
- JobId jobId;
+ TxnId txnId;
ITransactionContext txnCtx;
StringBuilder sb = new StringBuilder();
-
try {
sb.append("\n>>dump_begin\t>>----- [ConfVars] -----");
- Set<Map.Entry<JobId, ITransactionContext>> entrySet = transactionContextRepository.entrySet();
- if (entrySet != null) {
- for (Map.Entry<JobId, ITransactionContext> entry : entrySet) {
- if (entry != null) {
- jobId = entry.getKey();
- if (jobId != null) {
- sb.append("\n" + jobId);
- } else {
- sb.append("\nJID:null");
- }
+ Set<Map.Entry<TxnId, ITransactionContext>> entrySet = txnCtxRepository.entrySet();
+ for (Map.Entry<TxnId, ITransactionContext> entry : entrySet) {
+ if (entry != null) {
+ txnId = entry.getKey();
+ if (txnId != null) {
+ sb.append("\n" + txnId);
+ } else {
+ sb.append("\nJID:null");
+ }
- txnCtx = entry.getValue();
- if (txnCtx != null) {
- sb.append(txnCtx.prettyPrint());
- } else {
- sb.append("\nTxnCtx:null");
- }
+ txnCtx = entry.getValue();
+ if (txnCtx != null) {
+ sb.append(((AbstractTransactionContext) txnCtx).prettyPrint());
+ } else {
+ sb.append("\nTxnCtx:null");
}
}
}
-
sb.append("\n>>dump_end\t>>----- [ConfVars] -----\n");
os.write(sb.toString().getBytes());
- } catch (Exception e) {
- //ignore exception and continue dumping as much as possible.
- if (IS_DEBUG_MODE) {
- e.printStackTrace();
- }
+ } catch (IOException e) {
+ LOGGER.log(Level.WARNING, "exception while dumping state", e);
}
}
}
diff --git a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/JobIdFactory.java b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TxnIdFactory.java
similarity index 69%
rename from asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/JobIdFactory.java
rename to asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TxnIdFactory.java
index 6e0af1c..eb59e74 100644
--- a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/JobIdFactory.java
+++ b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/service/transaction/TxnIdFactory.java
@@ -18,21 +18,25 @@
*/
package org.apache.asterix.transaction.management.service.transaction;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
/**
* Represents a factory to generate unique transaction IDs.
*/
-public class JobIdFactory {
- private static final AtomicInteger Id = new AtomicInteger();
+public class TxnIdFactory {
- public static JobId generateJobId() {
- return new JobId(Id.incrementAndGet());
+ private static final AtomicLong id = new AtomicLong();
+
+ private TxnIdFactory() {
}
- public static void initJobId(int id) {
- Id.set(id);
+ public static TxnId create() {
+ return new TxnId(id.incrementAndGet());
}
-}
+
+ public static void ensureMinimumId(long id) {
+ TxnIdFactory.id.updateAndGet(current -> Math.max(current, id));
+ }
+}
\ No newline at end of file
diff --git a/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/LockManagerUnitTest.java b/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/LockManagerUnitTest.java
index 14e4020..64ac3cb 100644
--- a/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/LockManagerUnitTest.java
+++ b/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/LockManagerUnitTest.java
@@ -36,7 +36,7 @@
import org.apache.asterix.common.transactions.DatasetId;
import org.apache.asterix.common.transactions.ILockManager;
import org.apache.asterix.common.transactions.ITransactionContext;
-import org.apache.asterix.common.transactions.JobId;
+import org.apache.asterix.common.transactions.TxnId;
import org.apache.asterix.transaction.management.service.locking.Request.Kind;
import org.apache.asterix.transaction.management.service.transaction.TransactionManagementConstants.LockManagerConstants.LockMode;
import org.junit.After;
@@ -300,7 +300,7 @@
* @return throwable for said error
*/
private static Throwable getError(Map<String, Throwable> errors, ITransactionContext txnCtx) {
- return errors.get(txnCtx.getJobId().toString());
+ return errors.get(txnCtx.getTxnId().toString());
}
/**
@@ -318,7 +318,7 @@
Throwable error = getError(errors, txnCtx);
if (error == null) {
throw new AssertionError(
- "expected " + clazz.getSimpleName() + " for " + txnCtx.getJobId() + ", got no " + "exception");
+ "expected " + clazz.getSimpleName() + " for " + txnCtx.getTxnId() + ", got no " + "exception");
}
if (!clazz.isInstance(error)) {
throw new AssertionError(error);
@@ -354,7 +354,7 @@
private ITransactionContext j(int jId) {
if (!jobId2TxnCtxMap.containsKey(jId)) {
ITransactionContext mockTxnContext = mock(ITransactionContext.class);
- when(mockTxnContext.getJobId()).thenReturn(new JobId(jId));
+ when(mockTxnContext.getTxnId()).thenReturn(new TxnId(jId));
jobId2TxnCtxMap.put(jId, mockTxnContext);
}
return jobId2TxnCtxMap.get(jId);
diff --git a/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Locker.java b/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Locker.java
index 97b4f8a..ef7d40e 100644
--- a/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Locker.java
+++ b/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Locker.java
@@ -71,7 +71,7 @@
*/
Locker(ILockManager lockMgr, ITransactionContext txnCtx, List<Request> allRequests, AtomicInteger time,
PrintStream err) {
- this.name = txnCtx == null ? "admin" : txnCtx.getJobId().toString();
+ this.name = txnCtx == null ? "admin" : txnCtx.getTxnId().toString();
this.lockMgr = lockMgr;
this.requests = new LinkedList<>();
diff --git a/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Request.java b/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Request.java
index fd4dae5..112dc5f 100644
--- a/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Request.java
+++ b/asterixdb/asterix-transactions/src/test/java/org/apache/asterix/transaction/management/service/locking/Request.java
@@ -58,7 +58,7 @@
String asString(final Kind kind, final ITransactionContext txnCtx, final DatasetId dsId, final int hashValue,
final byte lockMode) {
- return txnCtx.getJobId() + ":" + kind.name() + ":" + dsId.getId() + ":" + hashValue + ":"
+ return txnCtx.getTxnId() + ":" + kind.name() + ":" + dsId.getId() + ":" + hashValue + ":"
+ TransactionManagementConstants.LockManagerConstants.LockMode.toString(lockMode);
}
@@ -147,7 +147,7 @@
@Override
public String toString() {
- return txnCtx.getJobId().toString() + ":" + kind.name();
+ return txnCtx.getTxnId().toString() + ":" + kind.name();
}
};
}
diff --git a/asterixdb/asterix-yarn/pom.xml b/asterixdb/asterix-yarn/pom.xml
index 0a9fa17..5e67c8e 100644
--- a/asterixdb/asterix-yarn/pom.xml
+++ b/asterixdb/asterix-yarn/pom.xml
@@ -459,6 +459,10 @@
<artifactId>hyracks-control-cc</artifactId>
</dependency>
<dependency>
+ <groupId>org.apache.hyracks</groupId>
+ <artifactId>algebricks-common</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-hdfs</artifactId>
</dependency>
diff --git a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java
index 4a900e1..8aeb718 100644
--- a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java
+++ b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/AsterixApplicationMaster.java
@@ -46,7 +46,6 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.asterix.common.config.GlobalConfig;
-import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.common.utils.StorageConstants;
import org.apache.asterix.event.schema.yarnCluster.Cluster;
import org.apache.asterix.event.schema.yarnCluster.MasterNode;
@@ -89,6 +88,7 @@
import org.apache.hadoop.yarn.exceptions.YarnException;
import org.apache.hadoop.yarn.util.ConverterUtils;
import org.apache.hadoop.yarn.util.Records;
+import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -383,7 +383,7 @@
LOG.info("Path suffix: " + instanceConfPath);
}
- public boolean init() throws ParseException, IOException, AsterixException, YarnException {
+ public boolean init() throws ParseException, IOException, AlgebricksException, YarnException {
try {
localizeDFSResources();
clusterDesc = Utils.parseYarnClusterConfig(CLUSTER_DESC_PATH);
diff --git a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Utils.java b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Utils.java
index de9ec90..675d4ab 100644
--- a/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Utils.java
+++ b/asterixdb/asterix-yarn/src/main/java/org/apache/asterix/aoya/Utils.java
@@ -28,6 +28,8 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Scanner;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import javax.xml.bind.JAXBContext;
@@ -35,7 +37,17 @@
import javax.xml.bind.Marshaller;
import javax.xml.bind.Unmarshaller;
-import org.apache.commons.httpclient.*;
+import org.apache.asterix.common.configuration.AsterixConfiguration;
+import org.apache.asterix.common.utils.InvokeUtil;
+import org.apache.asterix.event.schema.yarnCluster.Cluster;
+import org.apache.asterix.event.schema.yarnCluster.Node;
+import org.apache.commons.httpclient.HttpClient;
+import org.apache.commons.httpclient.HttpException;
+import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.HttpMethodRetryHandler;
+import org.apache.commons.httpclient.HttpStatus;
+import org.apache.commons.httpclient.NameValuePair;
+import org.apache.commons.httpclient.NoHttpResponseException;
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.params.HttpMethodParams;
@@ -49,10 +61,6 @@
import org.apache.hadoop.yarn.client.api.YarnClient;
import org.apache.hadoop.yarn.exceptions.YarnException;
-import org.apache.asterix.common.configuration.AsterixConfiguration;
-import org.apache.asterix.event.schema.yarnCluster.Cluster;
-import org.apache.asterix.event.schema.yarnCluster.Node;
-
public class Utils {
private Utils() {
@@ -105,11 +113,15 @@
//do nothing... this is expected
}
//now let's test that the instance is really down, or throw an exception
- try {
- executeHTTPCall(method);
- } catch (ConnectException e) {
- return;
- }
+ InvokeUtil.retryLoop(1, TimeUnit.MINUTES, 500, TimeUnit.MILLISECONDS, () -> {
+ try {
+ executeHTTPCall(method);
+ } catch (ConnectException e) {
+ //do nothing... this is expected
+ return true;
+ }
+ return false;
+ });
throw new IOException("Instance did not shut down cleanly.");
}
@@ -142,7 +154,7 @@
if (result == null) {
return false;
}
- if(method.getStatusCode() != HttpStatus.SC_OK){
+ if (method.getStatusCode() != HttpStatus.SC_OK) {
return false;
}
return true;
@@ -237,7 +249,7 @@
* @throws IOException
*/
public static void listBackups(Configuration conf, String confDirRel, String instance) throws IOException {
- List<String> backups = getBackups(conf,confDirRel,instance);
+ List<String> backups = getBackups(conf, confDirRel, instance);
if (backups.size() != 0) {
System.out.println("Backups for instance " + instance + ": ");
for (String name : backups) {
@@ -247,20 +259,22 @@
System.out.println("No backups found for instance " + instance + ".");
}
}
- /**
- * Return the available snapshot names
- * @param conf
- * @param confDirRel
- * @param instance
- * @return
- * @throws IOException
- */
- public static List<String> getBackups(Configuration conf, String confDirRel, String instance) throws IOException{
+
+ /**
+ * Return the available snapshot names
+ *
+ * @param conf
+ * @param confDirRel
+ * @param instance
+ * @return
+ * @throws IOException
+ */
+ public static List<String> getBackups(Configuration conf, String confDirRel, String instance) throws IOException {
FileSystem fs = FileSystem.get(conf);
Path backupFolder = new Path(fs.getHomeDirectory(), confDirRel + "/" + instance + "/" + "backups");
FileStatus[] backups = fs.listStatus(backupFolder);
List<String> backupNames = new ArrayList<String>();
- for(FileStatus f: backups){
+ for (FileStatus f : backups) {
backupNames.add(f.getPath().getName());
}
return backupNames;
@@ -441,8 +455,8 @@
return waitForLiveness(appId, false, true, message, yarnClient, "", null, port);
}
- public static boolean waitForApplication(ApplicationId appId, YarnClient yarnClient, int port) throws YarnException,
- IOException, JAXBException {
+ public static boolean waitForApplication(ApplicationId appId, YarnClient yarnClient, int port)
+ throws YarnException, IOException, JAXBException {
return waitForLiveness(appId, false, false, "", yarnClient, "", null, port);
}
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractLogicalOperator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractLogicalOperator.java
index 8b38a2b..4686f32 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractLogicalOperator.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/AbstractLogicalOperator.java
@@ -19,7 +19,7 @@
package org.apache.hyracks.algebricks.core.algebra.operators.logical;
import java.util.ArrayList;
-import java.util.IdentityHashMap;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -63,7 +63,7 @@
private AbstractLogicalOperator.ExecutionMode mode = AbstractLogicalOperator.ExecutionMode.UNPARTITIONED;
protected IPhysicalOperator physicalOperator;
- private final Map<String, Object> annotations = new IdentityHashMap<String, Object>();
+ private final Map<String, Object> annotations = new HashMap<>();
private boolean bJobGenEnabled = true;
protected final List<Mutable<ILogicalOperator>> inputs;
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AbstractLogicalOperatorPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AbstractLogicalOperatorPrettyPrintVisitor.java
index 140ba80..460f4d0 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AbstractLogicalOperatorPrettyPrintVisitor.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/AbstractLogicalOperatorPrettyPrintVisitor.java
@@ -84,6 +84,21 @@
}
}
+ protected AlgebricksAppendable addIndent(int level) throws AlgebricksException {
+ for (int i = 0; i < level; ++i) {
+ buffer.append(' ');
+ }
+ return buffer;
+ }
+
+ public void printPlan(ILogicalPlan plan, int indent) throws AlgebricksException {
+ for (Mutable<ILogicalOperator> root : plan.getRoots()) {
+ printOperator((AbstractLogicalOperator) root.getValue(), indent);
+ }
+ }
+
+ public abstract void printOperator(AbstractLogicalOperator op, int indent) throws AlgebricksException;
+
public static void printPhysicalOperator(AbstractLogicalOperator op, int indent, AlgebricksAppendable out)
throws AlgebricksException {
IPhysicalOperator pOp = op.getPhysicalOperator();
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
index fe63b89..3e75c66 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitor.java
@@ -88,17 +88,10 @@
super(app);
}
- public static void printPlan(ILogicalPlan plan, LogicalOperatorPrettyPrintVisitor pvisitor, int indent)
- throws AlgebricksException {
- for (Mutable<ILogicalOperator> root : plan.getRoots()) {
- printOperator((AbstractLogicalOperator) root.getValue(), pvisitor, indent);
- }
- }
-
- public static void printOperator(AbstractLogicalOperator op, LogicalOperatorPrettyPrintVisitor pvisitor, int indent)
- throws AlgebricksException {
- final AlgebricksAppendable out = pvisitor.get();
- op.accept(pvisitor, indent);
+ @Override
+ public void printOperator(AbstractLogicalOperator op, int indent) throws AlgebricksException {
+ final AlgebricksAppendable out = this.get();
+ op.accept(this, indent);
IPhysicalOperator pOp = op.getPhysicalOperator();
if (pOp != null) {
@@ -110,7 +103,7 @@
}
for (Mutable<ILogicalOperator> i : op.getInputs()) {
- printOperator((AbstractLogicalOperator) i.getValue(), pvisitor, indent + 2);
+ printOperator((AbstractLogicalOperator) i.getValue(), indent + 2);
}
}
@@ -155,8 +148,7 @@
@Override
public Void visitInnerJoinOperator(InnerJoinOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("join (").append(op.getCondition().getValue().accept(exprVisitor, indent)).
- append(")");
+ addIndent(indent).append("join (").append(op.getCondition().getValue().accept(exprVisitor, indent)).append(")");
return null;
}
@@ -400,12 +392,11 @@
buffer.append(" partitioned by ");
pprintExprList(op.getPrimaryKeyExpressions(), indent);
if (op.getOperation() == Kind.UPSERT) {
- buffer.append(
- " out: ([record-before-upsert:" + op.getBeforeOpRecordVar()
- + ((op.getBeforeOpAdditionalNonFilteringVars() != null)
- ? (", additional-before-upsert: " + op.getBeforeOpAdditionalNonFilteringVars())
- : "")
- + "]) ");
+ buffer.append(" out: ([record-before-upsert:" + op.getBeforeOpRecordVar()
+ + ((op.getBeforeOpAdditionalNonFilteringVars() != null)
+ ? (", additional-before-upsert: " + op.getBeforeOpAdditionalNonFilteringVars())
+ : "")
+ + "]) ");
}
if (op.isBulkload()) {
buffer.append(" [bulkload]");
@@ -464,13 +455,6 @@
return null;
}
- protected AlgebricksAppendable addIndent(int level) throws AlgebricksException {
- for (int i = 0; i < level; ++i) {
- buffer.append(' ');
- }
- return buffer;
- }
-
protected void printNestedPlans(AbstractOperatorWithNestedPlans op, Integer indent) throws AlgebricksException {
boolean first = true;
if (op.getNestedPlans().isEmpty()) {
@@ -485,7 +469,7 @@
} else {
addIndent(indent).append(" {\n");
}
- printPlan(p, this, indent + 10);
+ printPlan(p, indent + 10);
addIndent(indent).append(" }");
}
}
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
index fefb1e9..4283198 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/LogicalOperatorPrettyPrintVisitorJson.java
@@ -71,7 +71,6 @@
import org.apache.hyracks.algebricks.core.algebra.operators.logical.UnnestOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteOperator;
import org.apache.hyracks.algebricks.core.algebra.operators.logical.WriteResultOperator;
-import org.apache.hyracks.algebricks.core.algebra.visitors.ILogicalExpressionVisitor;
public class LogicalOperatorPrettyPrintVisitorJson extends AbstractLogicalOperatorPrettyPrintVisitor {
Map<AbstractLogicalOperator, String> operatorIdentity = new HashMap<>();
@@ -116,50 +115,44 @@
}
}
- public static void printPlanJson(ILogicalPlan plan, LogicalOperatorPrettyPrintVisitorJson pvisitor, int indent)
- throws AlgebricksException {
- for (Mutable<ILogicalOperator> root : plan.getRoots()) {
- printOperatorJson((AbstractLogicalOperator) root.getValue(), pvisitor, indent);
- }
- }
-
- public static void printOperatorJson(AbstractLogicalOperator op, LogicalOperatorPrettyPrintVisitorJson pvisitor,
- int indent) throws AlgebricksException {
+ @Override
+ public void printOperator(AbstractLogicalOperator op, int indent) throws AlgebricksException {
int currentIndent = indent;
- final AlgebricksAppendable out = pvisitor.get();
+ final AlgebricksAppendable out = get();
pad(out, currentIndent);
appendln(out, "{");
currentIndent++;
- op.accept(pvisitor, currentIndent);
+ op.accept(this, currentIndent);
appendln(out, ",");
pad(out, currentIndent);
- append(out, "\"operatorId\" : \"" + pvisitor.idCounter.printOperatorId(op) + "\"");
+ append(out, "\"operatorId\": \"" + idCounter.printOperatorId(op) + "\"");
IPhysicalOperator pOp = op.getPhysicalOperator();
if (pOp != null) {
appendln(out, ",");
pad(out, currentIndent);
- String pOperator = "\"physical-operator\":\"" + pOp.toString() + "\"";
+ String pOperator = "\"physical-operator\": \"" + pOp.toString() + "\"";
append(out, pOperator);
}
appendln(out, ",");
pad(out, currentIndent);
- append(out, "\"execution-mode\":\"" + op.getExecutionMode() + '"');
+ append(out, "\"execution-mode\": \"" + op.getExecutionMode() + '"');
if (!op.getInputs().isEmpty()) {
appendln(out, ",");
pad(out, currentIndent);
- appendln(out, "\"inputs\":[");
+ appendln(out, "\"inputs\": [");
boolean moreInputes = false;
for (Mutable<ILogicalOperator> k : op.getInputs()) {
if (moreInputes) {
append(out, ",");
}
- printOperatorJson((AbstractLogicalOperator) k.getValue(), pvisitor, currentIndent + 4);
+ printOperator((AbstractLogicalOperator) k.getValue(), currentIndent + 4);
moreInputes = true;
}
pad(out, currentIndent + 2);
appendln(out, "]");
+ } else {
+ out.append("\n");
}
- out.append("\n");
pad(out, currentIndent - 1);
appendln(out, "}");
}
@@ -167,30 +160,22 @@
public void variablePrintHelper(List<LogicalVariable> variables, Integer indent) throws AlgebricksException {
if (!variables.isEmpty()) {
addIndent(0).append(",\n");
- addIndent(indent).append("\"variables\" :[");
- boolean first = true;
- for (LogicalVariable v : variables) {
- if (!first) {
- buffer.append(",");
- }
- buffer.append("\"" + str(v) + "\"");
- first = false;
- }
+ addIndent(indent).append("\"variables\": [");
+ appendVars(variables);
buffer.append("]");
}
}
@Override
public Void visitAggregateOperator(AggregateOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"aggregate\"");
+ addIndent(indent).append("\"operator\": \"aggregate\"");
variablePrintHelper(op.getVariables(), indent);
-
return null;
}
@Override
public Void visitRunningAggregateOperator(RunningAggregateOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"running-aggregate\"");
+ addIndent(indent).append("\"operator\": \"running-aggregate\"");
variablePrintHelper(op.getVariables(), indent);
if (!op.getExpressions().isEmpty()) {
addIndent(0).append(",\n");
@@ -201,31 +186,31 @@
@Override
public Void visitEmptyTupleSourceOperator(EmptyTupleSourceOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"empty-tuple-source\"");
+ addIndent(indent).append("\"operator\": \"empty-tuple-source\"");
return null;
}
@Override
public Void visitGroupByOperator(GroupByOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"group-by\"");
+ addIndent(indent).append("\"operator\": \"group-by\"");
if (op.isGroupAll()) {
buffer.append(",\n");
- addIndent(indent).append("\"option\":\"all\"");
+ addIndent(indent).append("\"option\": \"all\"");
}
if (!op.getGroupByList().isEmpty()) {
buffer.append(",\n");
- addIndent(indent).append("\"group-by-list\":");
+ addIndent(indent).append("\"group-by-list\": ");
pprintVeList(op.getGroupByList(), indent);
}
if (!op.getDecorList().isEmpty()) {
buffer.append(",\n");
- addIndent(indent).append("\"decor-list\":");
+ addIndent(indent).append("\"decor-list\": ");
pprintVeList(op.getDecorList(), indent);
}
if (!op.getNestedPlans().isEmpty()) {
buffer.append(",\n");
- addIndent(indent).append("\"subplan\":");
+ addIndent(indent).append("\"subplan\": ");
printNestedPlans(op, indent);
}
return null;
@@ -233,7 +218,7 @@
@Override
public Void visitDistinctOperator(DistinctOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"distinct\"");
+ addIndent(indent).append("\"operator\": \"distinct\"");
if (!op.getExpressions().isEmpty()) {
addIndent(0).append(",\n");
pprintExprList(op.getExpressions(), indent);
@@ -243,39 +228,37 @@
@Override
public Void visitInnerJoinOperator(InnerJoinOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"join\",\n");
- addIndent(indent)
- .append("\"condition\":" + "\"" + op.getCondition().getValue().accept(exprVisitor, indent) + "\"");
+ addIndent(indent).append("\"operator\": \"join\",\n");
+ addIndent(indent).append("\"condition\": \"" + op.getCondition().getValue().accept(exprVisitor, indent) + "\"");
return null;
}
@Override
public Void visitLeftOuterJoinOperator(LeftOuterJoinOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"left-outer-join\",\n");
- addIndent(indent)
- .append("\"condition\":" + "\"" + op.getCondition().getValue().accept(exprVisitor, indent) + "\"");
+ addIndent(indent).append("\"operator\": \"left-outer-join\",\n");
+ addIndent(indent).append("\"condition\": \"" + op.getCondition().getValue().accept(exprVisitor, indent) + "\"");
return null;
}
@Override
public Void visitNestedTupleSourceOperator(NestedTupleSourceOperator op, Integer indent)
throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"nested-tuple-source\"");
+ addIndent(indent).append("\"operator\": \"nested-tuple-source\"");
return null;
}
@Override
public Void visitOrderOperator(OrderOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"order\"");
+ addIndent(indent).append("\"operator\": \"order\"");
for (Pair<OrderOperator.IOrder, Mutable<ILogicalExpression>> p : op.getOrderExpressions()) {
buffer.append(",\n");
if (op.getTopK() != -1) {
- addIndent(indent).append("\"topK\":\"" + op.getTopK() + "\",\n");
+ addIndent(indent).append("\"topK\": \"" + op.getTopK() + "\",\n");
}
String fst = getOrderString(p.first);
- addIndent(indent).append("\"first\":" + fst + ",\n");
- addIndent(indent)
- .append("\"second\":\"" + p.second.getValue().accept(exprVisitor, indent).replace('"', ' ') + "\"");
+ addIndent(indent).append("\"first\": " + fst + ",\n");
+ addIndent(indent).append(
+ "\"second\": \"" + p.second.getValue().accept(exprVisitor, indent).replace('"', ' ') + "\"");
}
return null;
}
@@ -293,7 +276,7 @@
@Override
public Void visitAssignOperator(AssignOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"assign\"");
+ addIndent(indent).append("\"operator\": \"assign\"");
variablePrintHelper(op.getVariables(), indent);
if (!op.getExpressions().isEmpty()) {
addIndent(0).append(",\n");
@@ -304,7 +287,7 @@
@Override
public Void visitWriteOperator(WriteOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"write\"");
+ addIndent(indent).append("\"operator\": \"write\"");
if (!op.getExpressions().isEmpty()) {
addIndent(0).append(",\n");
pprintExprList(op.getExpressions(), indent);
@@ -314,7 +297,7 @@
@Override
public Void visitDistributeResultOperator(DistributeResultOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"distribute-result\"");
+ addIndent(indent).append("\"operator\": \"distribute-result\"");
if (!op.getExpressions().isEmpty()) {
addIndent(0).append(",\n");
pprintExprList(op.getExpressions(), indent);
@@ -324,10 +307,10 @@
@Override
public Void visitWriteResultOperator(WriteResultOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"load\",\n");
+ addIndent(indent).append("\"operator\": \"load\",\n");
addIndent(indent).append(str(op.getDataSource())).append("\"from\":")
.append(op.getPayloadExpression().getValue().accept(exprVisitor, indent) + ",\n");
- addIndent(indent).append("\"partitioned-by\":{");
+ addIndent(indent).append("\"partitioned-by\": {");
pprintExprList(op.getKeyExpressions(), indent);
addIndent(indent).append("}");
return null;
@@ -335,15 +318,15 @@
@Override
public Void visitSelectOperator(SelectOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"select\",\n");
- addIndent(indent).append("\"expressions\":\""
+ addIndent(indent).append("\"operator\": \"select\",\n");
+ addIndent(indent).append("\"expressions\": \""
+ op.getCondition().getValue().accept(exprVisitor, indent).replace('"', ' ') + "\"");
return null;
}
@Override
public Void visitProjectOperator(ProjectOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"project\"");
+ addIndent(indent).append("\"operator\": \"project\"");
variablePrintHelper(op.getVariables(), indent);
return null;
}
@@ -351,7 +334,7 @@
@Override
public Void visitSubplanOperator(SubplanOperator op, Integer indent) throws AlgebricksException {
if (!op.getNestedPlans().isEmpty()) {
- addIndent(indent).append("\"subplan\":");
+ addIndent(indent).append("\"subplan\": ");
printNestedPlans(op, indent);
}
return null;
@@ -359,40 +342,29 @@
@Override
public Void visitUnionOperator(UnionAllOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"union\"");
+ addIndent(indent).append("\"operator\": \"union\"");
for (Triple<LogicalVariable, LogicalVariable, LogicalVariable> v : op.getVariableMappings()) {
buffer.append(",\n");
- addIndent(indent)
- .append("\"values\":[" + "\"" + v.first + "\"," + "\"" + v.second + "\"," + "\"" + v.third + "\"]");
+ addIndent(indent).append(
+ "\"values\": [" + "\"" + v.first + "\"," + "\"" + v.second + "\"," + "\"" + v.third + "\"]");
}
return null;
}
@Override
public Void visitIntersectOperator(IntersectOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"intersect\",\n");
+ addIndent(indent).append("\"operator\": \"intersect\",\n");
- addIndent(indent).append("\"output-variables\":[");
- for (int i = 0; i < op.getOutputVars().size(); i++) {
- if (i > 0) {
- buffer.append(", ");
- }
- buffer.append("\"" + str(op.getOutputVars().get(i)) + "\"");
- }
+ addIndent(indent).append("\"output-variables\": [");
+ appendVars(op.getOutputVars());
buffer.append("],");
- addIndent(indent).append("\"input_variables\":[");
+ addIndent(indent).append("\"input_variables\": [");
+
for (int i = 0; i < op.getNumInput(); i++) {
if (i > 0) {
buffer.append(",\n");
}
- buffer.append("[");
- for (int j = 0; j < op.getInputVariables(i).size(); j++) {
- if (j > 0) {
- buffer.append(", ");
- }
- buffer.append("\"" + str(op.getInputVariables(i).get(j)) + "\"");
- }
- buffer.append(']');
+ appendVars(op.getInputVariables(i));
}
buffer.append("]");
return null;
@@ -400,28 +372,28 @@
@Override
public Void visitUnnestOperator(UnnestOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"unnest\"");
+ addIndent(indent).append("\"operator\": \"unnest\"");
variablePrintHelper(op.getVariables(), indent);
if (op.getPositionalVariable() != null) {
buffer.append(",\n");
- addIndent(indent).append("\"position\":\"" + op.getPositionalVariable() + "\"");
+ addIndent(indent).append("\"position\": \"" + op.getPositionalVariable() + "\"");
}
buffer.append(",\n");
- addIndent(indent).append("\"expressions\":\""
+ addIndent(indent).append("\"expressions\": \""
+ op.getExpressionRef().getValue().accept(exprVisitor, indent).replace('"', ' ') + "\"");
return null;
}
@Override
public Void visitLeftOuterUnnestOperator(LeftOuterUnnestOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"outer-unnest\",\n");
- addIndent(indent).append("\"variables\":[\"" + op.getVariable() + "\"]");
+ addIndent(indent).append("\"operator\": \"outer-unnest\",\n");
+ addIndent(indent).append("\"variables\": [\"" + op.getVariable() + "\"]");
if (op.getPositionalVariable() != null) {
buffer.append(",\n");
- addIndent(indent).append("\"position\":" + op.getPositionalVariable());
+ addIndent(indent).append("\"position\": " + op.getPositionalVariable());
}
buffer.append(",\n");
- addIndent(indent).append("\"expressions\":\""
+ addIndent(indent).append("\"expressions\": \""
+ op.getExpressionRef().getValue().accept(exprVisitor, indent).replace('"', ' ') + "\"");
return null;
}
@@ -439,10 +411,10 @@
private Void printAbstractUnnestMapOperator(AbstractUnnestMapOperator op, Integer indent, String opSignature)
throws AlgebricksException {
- AlgebricksAppendable plan = addIndent(indent).append("\"operator\":\"" + opSignature + "\"");
+ AlgebricksAppendable plan = addIndent(indent).append("\"operator\": \"" + opSignature + "\"");
variablePrintHelper(op.getVariables(), indent);
buffer.append(",\n");
- addIndent(indent).append("\"expressions\":\""
+ addIndent(indent).append("\"expressions\": \""
+ op.getExpressionRef().getValue().accept(exprVisitor, indent).replace('"', ' ') + "\"");
appendFilterInformation(plan, op.getMinFilterVars(), op.getMaxFilterVars(), indent);
return null;
@@ -450,24 +422,17 @@
@Override
public Void visitDataScanOperator(DataSourceScanOperator op, Integer indent) throws AlgebricksException {
- AlgebricksAppendable plan = addIndent(indent).append("\"operator\":\"data-scan\"");
+ AlgebricksAppendable plan = addIndent(indent).append("\"operator\": \"data-scan\"");
if (!op.getProjectVariables().isEmpty()) {
addIndent(0).append(",\n");
- addIndent(indent).append("\"project-variables\":[");
- boolean first = true;
- for (LogicalVariable v : op.getProjectVariables()) {
- if (!first) {
- buffer.append(",");
- }
- buffer.append("\"" + str(v) + "\"");
- first = false;
- }
+ addIndent(indent).append("\"project-variables\": [");
+ appendVars(op.getProjectVariables());
buffer.append("]");
}
variablePrintHelper(op.getVariables(), indent);
if (op.getDataSource() != null) {
addIndent(0).append(",\n");
- addIndent(indent).append("\"data-source\":\"" + op.getDataSource() + "\"");
+ addIndent(indent).append("\"data-source\": \"" + op.getDataSource() + "\"");
}
appendFilterInformation(plan, op.getMinFilterVars(), op.getMaxFilterVars(), indent);
return null;
@@ -478,19 +443,12 @@
if (minFilterVars != null || maxFilterVars != null) {
plan.append(",\n");
addIndent(indent);
- plan.append("\"with-filter-on\":{");
+ plan.append("\"with-filter-on\": {");
}
if (minFilterVars != null) {
buffer.append("\n");
- addIndent(indent).append("\"min\":[");
- boolean first = true;
- for (LogicalVariable v : minFilterVars) {
- if (!first) {
- buffer.append(",");
- }
- buffer.append("\"" + str(v) + "\"");
- first = false;
- }
+ addIndent(indent).append("\"min\": [");
+ appendVars(minFilterVars);
buffer.append("]");
}
if (minFilterVars != null && maxFilterVars != null) {
@@ -498,15 +456,8 @@
}
if (maxFilterVars != null) {
buffer.append("\n");
- addIndent(indent).append("\"max\":[");
- boolean first = true;
- for (LogicalVariable v : maxFilterVars) {
- if (!first) {
- buffer.append(",");
- }
- buffer.append("\"" + str(v) + "\"");
- first = false;
- }
+ addIndent(indent).append("\"max\": [");
+ appendVars(maxFilterVars);
buffer.append("]");
}
if (minFilterVars != null || maxFilterVars != null) {
@@ -516,51 +467,48 @@
return null;
}
+ private void appendVars(List<LogicalVariable> minFilterVars) throws AlgebricksException {
+ boolean first = true;
+ for (LogicalVariable v : minFilterVars) {
+ if (!first) {
+ buffer.append(",");
+ }
+ buffer.append("\"" + str(v) + "\"");
+ first = false;
+ }
+ }
+
@Override
public Void visitLimitOperator(LimitOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"limit\",\n");
- addIndent(indent).append("\"value\":\"" + op.getMaxObjects().getValue().accept(exprVisitor, indent) + "\"");
+ addIndent(indent).append("\"operator\": \"limit\",\n");
+ addIndent(indent).append("\"value\": \"" + op.getMaxObjects().getValue().accept(exprVisitor, indent) + "\"");
ILogicalExpression offset = op.getOffset().getValue();
if (offset != null) {
buffer.append(",\n");
- addIndent(indent).append("\"offset\":\"" + offset.accept(exprVisitor, indent) + "\"");
+ addIndent(indent).append("\"offset\": \"" + offset.accept(exprVisitor, indent) + "\"");
}
return null;
}
@Override
public Void visitExchangeOperator(ExchangeOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"exchange\"");
+ addIndent(indent).append("\"operator\": \"exchange\"");
return null;
}
@Override
public Void visitScriptOperator(ScriptOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"script\"");
+ addIndent(indent).append("\"operator\": \"script\"");
if (!op.getInputVariables().isEmpty()) {
addIndent(0).append(",\n");
- addIndent(indent).append("\"in\":[");
- boolean first = true;
- for (LogicalVariable v : op.getInputVariables()) {
- if (!first) {
- buffer.append(",");
- }
- buffer.append("\"" + str(v) + "\"");
- first = false;
- }
+ addIndent(indent).append("\"in\": [");
+ appendVars(op.getInputVariables());
buffer.append("]");
}
if (!op.getOutputVariables().isEmpty()) {
addIndent(0).append(",\n");
- addIndent(indent).append("\"out\":[");
- boolean first = true;
- for (LogicalVariable v : op.getOutputVariables()) {
- if (!first) {
- buffer.append(",");
- }
- buffer.append("\"" + str(v) + "\"");
- first = false;
- }
+ addIndent(indent).append("\"out\": [");
+ appendVars(op.getOutputVariables());
buffer.append("]");
}
return null;
@@ -568,54 +516,54 @@
@Override
public Void visitReplicateOperator(ReplicateOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"replicate\"");
+ addIndent(indent).append("\"operator\": \"replicate\"");
return null;
}
@Override
public Void visitSplitOperator(SplitOperator op, Integer indent) throws AlgebricksException {
Mutable<ILogicalExpression> branchingExpression = op.getBranchingExpression();
- addIndent(indent).append("\"operator\":\"split\",\n");
+ addIndent(indent).append("\"operator\": \"split\",\n");
addIndent(indent).append("\"" + branchingExpression.getValue().accept(exprVisitor, indent) + "\"");
return null;
}
@Override
public Void visitMaterializeOperator(MaterializeOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"materialize\"");
+ addIndent(indent).append("\"operator\": \"materialize\"");
return null;
}
@Override
public Void visitInsertDeleteUpsertOperator(InsertDeleteUpsertOperator op, Integer indent)
throws AlgebricksException {
- String header = "\"operator\":\"" + getIndexOpString(op.getOperation()) + "\",\n";
+ String header = "\"operator\": \"" + getIndexOpString(op.getOperation()) + "\",\n";
addIndent(indent).append(header);
- addIndent(indent).append(str("\"data-source\":\"" + op.getDataSource() + "\",\n"));
- addIndent(indent).append("\"from-record\":\"")
+ addIndent(indent).append(str("\"data-source\": \"" + op.getDataSource() + "\",\n"));
+ addIndent(indent).append("\"from-record\": \"")
.append(op.getPayloadExpression().getValue().accept(exprVisitor, indent) + "\"");
if (op.getAdditionalNonFilteringExpressions() != null) {
- buffer.append(",\n\"meta\":\"");
+ buffer.append(",\n\"meta\": \"");
pprintExprList(op.getAdditionalNonFilteringExpressions(), 0);
buffer.append("\"");
}
buffer.append(",\n");
- addIndent(indent).append("\"partitioned-by\":{");
+ addIndent(indent).append("\"partitioned-by\": {");
pprintExprList(op.getPrimaryKeyExpressions(), 0);
buffer.append("}");
if (op.getOperation() == Kind.UPSERT) {
- addIndent(indent).append(",\n\"out\":{\n");
- addIndent(indent).append("\"record-before-upsert\":\"" + op.getBeforeOpRecordVar() + "\"");
+ addIndent(indent).append(",\n\"out\": {\n");
+ addIndent(indent).append("\"record-before-upsert\": \"" + op.getBeforeOpRecordVar() + "\"");
if (op.getBeforeOpAdditionalNonFilteringVars() != null) {
buffer.append(",\n");
addIndent(indent)
- .append("\"additional-before-upsert\":\"" + op.getBeforeOpAdditionalNonFilteringVars() + "\"");
+ .append("\"additional-before-upsert\": \"" + op.getBeforeOpAdditionalNonFilteringVars() + "\"");
}
addIndent(indent).append("}");
}
if (op.isBulkload()) {
buffer.append(",\n");
- addIndent(indent).append("\"bulkload\":\"true\"");
+ addIndent(indent).append("\"bulkload\": true");
}
return null;
}
@@ -624,17 +572,17 @@
public Void visitIndexInsertDeleteUpsertOperator(IndexInsertDeleteUpsertOperator op, Integer indent)
throws AlgebricksException {
String header = getIndexOpString(op.getOperation());
- addIndent(indent).append("\"operator\":\"" + header + "\",\n");
- addIndent(indent).append("\"index\":\"" + op.getIndexName() + "\",\n");
- addIndent(indent).append("\"on\":\"").append(str(op.getDataSourceIndex().getDataSource()) + "\",\n");
- addIndent(indent).append("\"from\":{");
+ addIndent(indent).append("\"operator\": \"" + header + "\",\n");
+ addIndent(indent).append("\"index\": \"" + op.getIndexName() + "\",\n");
+ addIndent(indent).append("\"on\": \"").append(str(op.getDataSourceIndex().getDataSource()) + "\",\n");
+ addIndent(indent).append("\"from\": {");
if (op.getOperation() == Kind.UPSERT) {
- addIndent(indent).append("[\"replace\":\"");
+ addIndent(indent).append("[\"replace\": \"");
pprintExprList(op.getPrevSecondaryKeyExprs(), 0);
buffer.append("\",\n");
- addIndent(indent).append("\"with\":\"");
+ addIndent(indent).append("\"with\": \"");
pprintExprList(op.getSecondaryKeyExpressions(), 0);
buffer.append("\"}");
} else {
@@ -644,7 +592,7 @@
addIndent(indent).append("}");
if (op.isBulkload()) {
buffer.append(",\n");
- buffer.append("\"bulkload\":\"true\"");
+ buffer.append("\"bulkload\": true");
}
return null;
}
@@ -663,7 +611,7 @@
@Override
public Void visitTokenizeOperator(TokenizeOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"tokenize\"");
+ addIndent(indent).append("\"operator\": \"tokenize\"");
variablePrintHelper(op.getTokenizeVars(), indent);
if (!op.getSecondaryKeyExpressions().isEmpty()) {
addIndent(0).append(",\n");
@@ -674,23 +622,16 @@
@Override
public Void visitSinkOperator(SinkOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"sink\"");
+ addIndent(indent).append("\"operator\": \"sink\"");
return null;
}
@Override
public Void visitDelegateOperator(DelegateOperator op, Integer indent) throws AlgebricksException {
- addIndent(indent).append("\"operator\":\"" + op.toString() + "\"");
+ addIndent(indent).append("\"operator\": \"" + op.toString() + "\"");
return null;
}
- protected AlgebricksAppendable addIndent(int level) throws AlgebricksException {
- for (int i = 0; i < level; ++i) {
- buffer.append(' ');
- }
- return buffer;
- }
-
protected void printNestedPlans(AbstractOperatorWithNestedPlans op, Integer indent) throws AlgebricksException {
idCounter.nextPrefix();
buffer.append("[\n");
@@ -699,19 +640,17 @@
if (!first) {
buffer.append(",");
}
- printPlanJson(p, this, indent + 4);
+ printPlan(p, indent + 4);
first = false;
-
}
addIndent(indent).append("]");
idCounter.previousPrefix();
}
- //Done--Look for exprRef
protected void pprintExprList(List<Mutable<ILogicalExpression>> expressions, Integer indent)
throws AlgebricksException {
addIndent(indent);
- buffer.append("\"expressions\":\"");
+ buffer.append("\"expressions\": \"");
boolean first = true;
for (Mutable<ILogicalExpression> exprRef : expressions) {
if (first) {
@@ -727,22 +666,21 @@
protected void pprintVeList(List<Pair<LogicalVariable, Mutable<ILogicalExpression>>> vePairList, Integer indent)
throws AlgebricksException {
buffer.append("[");
- boolean fst = true;
+ boolean first = true;
for (Pair<LogicalVariable, Mutable<ILogicalExpression>> ve : vePairList) {
- if (fst) {
- fst = false;
+ if (first) {
+ first = false;
} else {
buffer.append(",");
}
if (ve.first != null) {
- buffer.append("{\"variable\":\"" + ve.first.toString().replace('"', ' ') + "\"," + "\"expression\":\""
+ buffer.append("{\"variable\": \"" + ve.first.toString().replace('"', ' ') + "\"," + "\"expression\": \""
+ ve.second.toString().replace('"', ' ') + "\"}");
} else {
- buffer.append("{\"expression\":\"" + ve.second.getValue().accept(exprVisitor, indent).replace('"', ' ')
+ buffer.append("{\"expression\": \"" + ve.second.getValue().accept(exprVisitor, indent).replace('"', ' ')
+ "\"}");
}
}
buffer.append("]");
}
-
}
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/PlanPrettyPrinter.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/PlanPrettyPrinter.java
index cf99d3b..67640c5 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/PlanPrettyPrinter.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/prettyprint/PlanPrettyPrinter.java
@@ -23,37 +23,18 @@
import org.apache.hyracks.algebricks.core.algebra.operators.logical.AbstractLogicalOperator;
public class PlanPrettyPrinter {
- @FunctionalInterface
- public interface print<T1, T2, T3> {
- void apply(T1 arg1, T2 arg2, T3 arg3) throws AlgebricksException;
- }
-
- public static void printOperator(AbstractLogicalOperator op, LogicalOperatorPrettyPrintVisitor pvisitor,
+ public static void printOperator(AbstractLogicalOperator op, AbstractLogicalOperatorPrettyPrintVisitor pvisitor,
int indent) throws AlgebricksException {
- print<AbstractLogicalOperator, LogicalOperatorPrettyPrintVisitor, Integer> printOperator =
- LogicalOperatorPrettyPrintVisitor::printOperator;
- printOperator.apply(op, pvisitor, indent);
+ pvisitor.printOperator(op, indent);
}
- public static <T extends AbstractLogicalOperatorPrettyPrintVisitor> void printPlan(ILogicalPlan plan,
- T pvisitor, int indent) throws AlgebricksException {
- if (pvisitor.getClass().equals(LogicalOperatorPrettyPrintVisitor.class)) {
- print<ILogicalPlan, LogicalOperatorPrettyPrintVisitor, Integer> printPlan =
- LogicalOperatorPrettyPrintVisitor::printPlan;
- printPlan.apply(plan,(LogicalOperatorPrettyPrintVisitor) pvisitor, indent);
- }
- else if (pvisitor.getClass().equals(LogicalOperatorPrettyPrintVisitorJson.class)) {
- print<ILogicalPlan, LogicalOperatorPrettyPrintVisitorJson, Integer> printPlan =
- LogicalOperatorPrettyPrintVisitorJson::printPlanJson;
- printPlan.apply(plan, (LogicalOperatorPrettyPrintVisitorJson)pvisitor, indent);
- }
-
+ public static void printPlan(ILogicalPlan plan, AbstractLogicalOperatorPrettyPrintVisitor pvisitor, int indent)
+ throws AlgebricksException {
+ pvisitor.printPlan(plan, indent);
}
public static void printPhysicalOps(ILogicalPlan plan, AlgebricksAppendable out, int indent)
throws AlgebricksException {
- print<ILogicalPlan, AlgebricksAppendable, Integer> printOperator =
- AbstractLogicalOperatorPrettyPrintVisitor::printPhysicalOps;
- printOperator.apply(plan, out, indent);
+ AbstractLogicalOperatorPrettyPrintVisitor.printPhysicalOps(plan, out, indent);
}
}
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java
index 9c452bf..10e3432 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatBuilder.java
@@ -223,6 +223,7 @@
if (value == null) {
newValue = "";
}
+ newValue = newValue.replace("\n", "\\n");
return new StringValue("\"" + newValue.replace("\"","\'").trim() + "\"");
}
}
diff --git a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java
index 392bf44..1ea2d19 100644
--- a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java
+++ b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/utils/DotFormatGenerator.java
@@ -178,11 +178,13 @@
rightOperator = entry.getValue().getRight().getLeft();
source = leftOperator.getClass().getName().substring(
leftOperator.getClass().getName().lastIndexOf(".") + 1);
- sourceNode = graphBuilder.createNode(DotFormatBuilder.StringValue.of(leftOperator.toString()),
+ sourceNode = graphBuilder.createNode(
+ DotFormatBuilder.StringValue.of(leftOperator.getOperatorId().toString()),
DotFormatBuilder.StringValue.of(leftOperator.toString() + "-" + source));
destination = rightOperator.getClass().getName().substring(
rightOperator.getClass().getName().lastIndexOf(".") + 1);
- destinationNode = graphBuilder.createNode(DotFormatBuilder.StringValue.of(rightOperator.toString()),
+ destinationNode = graphBuilder.createNode(
+ DotFormatBuilder.StringValue.of(rightOperator.getOperatorId().toString()),
DotFormatBuilder.StringValue.of(rightOperator.toString() + "-" + destination));
graphBuilder.createEdge(sourceNode, destinationNode).setLabel(DotFormatBuilder.StringValue.of(edgeLabel));
}
diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/base/AbstractOneInputOneOutputOneFramePushRuntime.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/base/AbstractOneInputOneOutputOneFramePushRuntime.java
index 2d8eaed..a7468a7 100644
--- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/base/AbstractOneInputOneOutputOneFramePushRuntime.java
+++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/base/AbstractOneInputOneOutputOneFramePushRuntime.java
@@ -51,13 +51,25 @@
@Override
public void close() throws HyracksDataException {
+ HyracksDataException closeException = null;
try {
flushIfNotFailed();
} catch (Exception e) {
+ closeException = HyracksDataException.create(e);
writer.fail();
- throw e;
} finally {
- writer.close();
+ try {
+ writer.close();
+ } catch (Exception e) {
+ if (closeException == null) {
+ closeException = HyracksDataException.create(e);
+ } else {
+ closeException.addSuppressed(e);
+ }
+ }
+ }
+ if (closeException != null) {
+ throw closeException;
}
}
diff --git a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/AlgebricksMetaOperatorDescriptor.java b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/AlgebricksMetaOperatorDescriptor.java
index f6ebf19..25a4aea 100644
--- a/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/AlgebricksMetaOperatorDescriptor.java
+++ b/hyracks-fullstack/algebricks/algebricks-runtime/src/main/java/org/apache/hyracks/algebricks/runtime/operators/meta/AlgebricksMetaOperatorDescriptor.java
@@ -78,33 +78,48 @@
public IOperatorNodePushable createPushRuntime(final IHyracksTaskContext ctx,
final IRecordDescriptorProvider recordDescProvider, int partition, int nPartitions) {
if (inputArity == 0) {
- return createSourceInputPushRuntime(ctx);
+ return new SourcePushRuntime(ctx);
} else {
return createOneInputOneOutputPushRuntime(ctx, recordDescProvider);
}
}
- private IOperatorNodePushable createSourceInputPushRuntime(final IHyracksTaskContext ctx) {
- return new AbstractUnaryOutputSourceOperatorNodePushable() {
+ private class SourcePushRuntime extends AbstractUnaryOutputSourceOperatorNodePushable {
+ private final IHyracksTaskContext ctx;
- @Override
- public void initialize() throws HyracksDataException {
- IFrameWriter startOfPipeline;
- RecordDescriptor pipelineOutputRecordDescriptor =
- outputArity > 0 ? AlgebricksMetaOperatorDescriptor.this.outRecDescs[0] : null;
- PipelineAssembler pa =
- new PipelineAssembler(pipeline, inputArity, outputArity, null, pipelineOutputRecordDescriptor);
- startOfPipeline = pa.assemblePipeline(writer, ctx);
+ public SourcePushRuntime(IHyracksTaskContext ctx) {
+ this.ctx = ctx;
+ }
+
+ @Override
+ public void initialize() throws HyracksDataException {
+ IFrameWriter startOfPipeline;
+ RecordDescriptor pipelineOutputRecordDescriptor =
+ outputArity > 0 ? AlgebricksMetaOperatorDescriptor.this.outRecDescs[0] : null;
+ PipelineAssembler pa =
+ new PipelineAssembler(pipeline, inputArity, outputArity, null, pipelineOutputRecordDescriptor);
+ startOfPipeline = pa.assemblePipeline(writer, ctx);
+ HyracksDataException exception = null;
+ try {
+ startOfPipeline.open();
+ } catch (Exception e) {
+ startOfPipeline.fail();
+ exception = HyracksDataException.create(e);
+ } finally {
try {
- startOfPipeline.open();
- } catch (Exception e) {
- startOfPipeline.fail();
- throw e;
- } finally {
startOfPipeline.close();
+ } catch (Exception e) {
+ if (exception == null) {
+ exception = HyracksDataException.create(e);
+ } else {
+ exception.addSuppressed(e);
+ }
}
}
- };
+ if (exception != null) {
+ throw exception;
+ }
+ }
}
private IOperatorNodePushable createOneInputOneOutputPushRuntime(final IHyracksTaskContext ctx,
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
index 95479c1..23c41fe 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceFunctions.java
@@ -22,10 +22,13 @@
import java.net.URL;
import java.util.EnumSet;
import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.apache.hyracks.api.dataset.DatasetDirectoryRecord;
import org.apache.hyracks.api.dataset.ResultSetId;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
@@ -104,12 +107,12 @@
}
}
- public static class DistributeJobFunction extends Function {
+ public static class DeployJobSpecFunction extends Function {
private static final long serialVersionUID = 1L;
private final byte[] acggfBytes;
- public DistributeJobFunction(byte[] acggfBytes) {
+ public DeployJobSpecFunction(byte[] acggfBytes) {
this.acggfBytes = acggfBytes;
}
@@ -145,13 +148,13 @@
}
}
- public static class DestroyJobFunction extends Function {
+ public static class UndeployJobSpecFunction extends Function {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
- public DestroyJobFunction(JobId jobId) {
- this.jobId = jobId;
+ public UndeployJobSpecFunction(DeployedJobSpecId deployedJobSpecId) {
+ this.deployedJobSpecId = deployedJobSpecId;
}
@Override
@@ -159,8 +162,8 @@
return FunctionId.DESTROY_JOB;
}
- public JobId getJobId() {
- return jobId;
+ public DeployedJobSpecId getDeployedJobSpecId() {
+ return deployedJobSpecId;
}
}
@@ -168,27 +171,30 @@
private static final long serialVersionUID = 1L;
private final byte[] acggfBytes;
- private final EnumSet<JobFlag> jobFlags;
+ private final Set<JobFlag> jobFlags;
private final DeploymentId deploymentId;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
+ private final Map<byte[], byte[]> jobParameters;
- public StartJobFunction(DeploymentId deploymentId, byte[] acggfBytes, EnumSet<JobFlag> jobFlags, JobId jobId) {
+ public StartJobFunction(DeploymentId deploymentId, byte[] acggfBytes, Set<JobFlag> jobFlags,
+ DeployedJobSpecId deployedJobSpecId, Map<byte[], byte[]> jobParameters) {
this.acggfBytes = acggfBytes;
this.jobFlags = jobFlags;
this.deploymentId = deploymentId;
- this.jobId = jobId;
+ this.deployedJobSpecId = deployedJobSpecId;
+ this.jobParameters = jobParameters;
}
- public StartJobFunction(JobId jobId) {
- this(null, null, EnumSet.noneOf(JobFlag.class), jobId);
+ public StartJobFunction(DeployedJobSpecId deployedJobSpecId, Map<byte[], byte[]> jobParameters) {
+ this(null, null, EnumSet.noneOf(JobFlag.class), deployedJobSpecId, jobParameters);
}
- public StartJobFunction(byte[] acggfBytes, EnumSet<JobFlag> jobFlags) {
- this(null, acggfBytes, jobFlags, null);
+ public StartJobFunction(byte[] acggfBytes, Set<JobFlag> jobFlags) {
+ this(null, acggfBytes, jobFlags, null, null);
}
- public StartJobFunction(DeploymentId deploymentId, byte[] acggfBytes, EnumSet<JobFlag> jobFlags) {
- this(deploymentId, acggfBytes, jobFlags, null);
+ public StartJobFunction(DeploymentId deploymentId, byte[] acggfBytes, Set<JobFlag> jobFlags) {
+ this(deploymentId, acggfBytes, jobFlags, null, null);
}
@Override
@@ -196,15 +202,19 @@
return FunctionId.START_JOB;
}
- public JobId getJobId() {
- return jobId;
+ public Map<byte[], byte[]> getJobParameters() {
+ return jobParameters;
+ }
+
+ public DeployedJobSpecId getDeployedJobSpecId() {
+ return deployedJobSpecId;
}
public byte[] getACGGFBytes() {
return acggfBytes;
}
- public EnumSet<JobFlag> getJobFlags() {
+ public Set<JobFlag> getJobFlags() {
return jobFlags;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java
index 0ded84f..eddcaa5 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksClientInterfaceRemoteProxy.java
@@ -26,6 +26,7 @@
import org.apache.hyracks.api.comm.NetworkAddress;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobInfo;
@@ -76,9 +77,9 @@
}
@Override
- public JobId startJob(JobId jobId) throws Exception {
+ public JobId startJob(DeployedJobSpecId deployedJobSpecId, Map<byte[], byte[]> jobParameters) throws Exception {
HyracksClientInterfaceFunctions.StartJobFunction sjf =
- new HyracksClientInterfaceFunctions.StartJobFunction(jobId);
+ new HyracksClientInterfaceFunctions.StartJobFunction(deployedJobSpecId, jobParameters);
return (JobId) rpci.call(ipcHandle, sjf);
}
@@ -90,17 +91,17 @@
}
@Override
- public JobId distributeJob(byte[] acggfBytes) throws Exception {
- HyracksClientInterfaceFunctions.DistributeJobFunction sjf =
- new HyracksClientInterfaceFunctions.DistributeJobFunction(acggfBytes);
- return (JobId) rpci.call(ipcHandle, sjf);
+ public DeployedJobSpecId deployJobSpec(byte[] acggfBytes) throws Exception {
+ HyracksClientInterfaceFunctions.DeployJobSpecFunction sjf =
+ new HyracksClientInterfaceFunctions.DeployJobSpecFunction(acggfBytes);
+ return (DeployedJobSpecId) rpci.call(ipcHandle, sjf);
}
@Override
- public JobId destroyJob(JobId jobId) throws Exception {
- HyracksClientInterfaceFunctions.DestroyJobFunction sjf =
- new HyracksClientInterfaceFunctions.DestroyJobFunction(jobId);
- return (JobId) rpci.call(ipcHandle, sjf);
+ public DeployedJobSpecId undeployJobSpec(DeployedJobSpecId deployedJobSpecId) throws Exception {
+ HyracksClientInterfaceFunctions.UndeployJobSpecFunction sjf =
+ new HyracksClientInterfaceFunctions.UndeployJobSpecFunction(deployedJobSpecId);
+ return (DeployedJobSpecId) rpci.call(ipcHandle, sjf);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java
index e979da6..85ef927 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/HyracksConnection.java
@@ -36,6 +36,7 @@
import org.apache.hyracks.api.comm.NetworkAddress;
import org.apache.hyracks.api.deployment.DeploymentId;
import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.IActivityClusterGraphGeneratorFactory;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
@@ -109,20 +110,20 @@
}
@Override
- public JobId distributeJob(JobSpecification jobSpec) throws Exception {
- IActivityClusterGraphGeneratorFactory jsacggf =
+ public DeployedJobSpecId deployJobSpec(JobSpecification jobSpec) throws Exception {
+ JobSpecificationActivityClusterGraphGeneratorFactory jsacggf =
new JobSpecificationActivityClusterGraphGeneratorFactory(jobSpec);
- return distributeJob(jsacggf);
+ return deployJobSpec(jsacggf);
}
@Override
- public JobId destroyJob(JobId jobId) throws Exception {
- return hci.destroyJob(jobId);
+ public DeployedJobSpecId undeployJobSpec(DeployedJobSpecId deployedJobSpecId) throws Exception {
+ return hci.undeployJobSpec(deployedJobSpecId);
}
@Override
- public JobId startJob(JobId jobId) throws Exception {
- return hci.startJob(jobId);
+ public JobId startJob(DeployedJobSpecId deployedJobSpecId, Map<byte[], byte[]> jobParameters) throws Exception {
+ return hci.startJob(deployedJobSpecId, jobParameters);
}
@Override
@@ -130,8 +131,8 @@
return hci.startJob(JavaSerializationUtils.serialize(acggf), jobFlags);
}
- public JobId distributeJob(IActivityClusterGraphGeneratorFactory acggf) throws Exception {
- return hci.distributeJob(JavaSerializationUtils.serialize(acggf));
+ public DeployedJobSpecId deployJobSpec(IActivityClusterGraphGeneratorFactory acggf) throws Exception {
+ return hci.deployJobSpec(JavaSerializationUtils.serialize(acggf));
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java
index a7c1d75..510a6b6 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientConnection.java
@@ -20,9 +20,11 @@
import java.util.EnumSet;
import java.util.List;
+import java.util.Map;
import org.apache.hyracks.api.comm.NetworkAddress;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.IActivityClusterGraphGeneratorFactory;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
@@ -94,25 +96,27 @@
* Flags
* @throws Exception
*/
- JobId distributeJob(JobSpecification jobSpec) throws Exception;
+ DeployedJobSpecId deployJobSpec(JobSpecification jobSpec) throws Exception;
/**
- * Destroy the distributed graph for a pre-distributed job
+ * Remove the deployed Job Spec
*
- * @param jobId
- * The id of the predistributed job
+ * @param deployedJobSpecId
+ * The id of the deployed job spec
* @throws Exception
*/
- JobId destroyJob(JobId jobId) throws Exception;
+ DeployedJobSpecId undeployJobSpec(DeployedJobSpecId deployedJobSpecId) throws Exception;
/**
- * Used to run a pre-distributed job by id (the same JobId will be returned)
+ * Used to run a deployed Job Spec by id
*
- * @param jobId
- * The id of the predistributed job
+ * @param deployedJobSpecId
+ * The id of the deployed job spec
+ * @param jobParameters
+ * The serialized job parameters
* @throws Exception
*/
- JobId startJob(JobId jobId) throws Exception;
+ JobId startJob(DeployedJobSpecId deployedJobSpecId, Map<byte[], byte[]> jobParameters) throws Exception;
/**
* Start the specified Job.
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java
index 9cebd3e..f0c7872 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/IHyracksClientInterface.java
@@ -25,6 +25,7 @@
import org.apache.hyracks.api.comm.NetworkAddress;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobInfo;
@@ -38,13 +39,13 @@
public JobId startJob(byte[] acggfBytes, EnumSet<JobFlag> jobFlags) throws Exception;
- public JobId startJob(JobId jobId) throws Exception;
+ public JobId startJob(DeployedJobSpecId deployedJobSpecId, Map<byte[], byte[]> jobParameters) throws Exception;
public void cancelJob(JobId jobId) throws Exception;
- public JobId distributeJob(byte[] acggfBytes) throws Exception;
+ public DeployedJobSpecId deployJobSpec(byte[] acggfBytes) throws Exception;
- public JobId destroyJob(JobId jobId) throws Exception;
+ public DeployedJobSpecId undeployJobSpec(DeployedJobSpecId deployedJobSpecId) throws Exception;
public NetworkAddress getDatasetDirectoryServiceInfo() throws Exception;
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeStatus.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeStatus.java
index b84f1f2..10a9a3c 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeStatus.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/NodeStatus.java
@@ -19,6 +19,7 @@
package org.apache.hyracks.api.client;
public enum NodeStatus {
- ALIVE,
+ ACTIVE,
+ BOOTING,
DEAD
}
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java
index 7dd5fe9..0b2cc9b 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/ActivityClusterGraphBuilder.java
@@ -28,7 +28,6 @@
import java.util.logging.Logger;
import org.apache.commons.lang3.tuple.Pair;
-
import org.apache.hyracks.api.dataflow.ActivityId;
import org.apache.hyracks.api.dataflow.IActivity;
import org.apache.hyracks.api.dataflow.IConnectorDescriptor;
@@ -36,7 +35,6 @@
import org.apache.hyracks.api.job.ActivityClusterGraph;
import org.apache.hyracks.api.job.ActivityClusterId;
import org.apache.hyracks.api.job.JobActivityGraph;
-import org.apache.hyracks.api.job.JobId;
public class ActivityClusterGraphBuilder {
private static final Logger LOGGER = Logger.getLogger(ActivityClusterGraphBuilder.class.getName());
@@ -70,7 +68,7 @@
return null;
}
- public ActivityClusterGraph inferActivityClusters(JobId jobId, JobActivityGraph jag) {
+ public ActivityClusterGraph inferActivityClusters(JobActivityGraph jag) {
/*
* Build initial equivalence sets map. We create a map such that for each IOperatorTask, t -> { t }
*/
@@ -99,7 +97,7 @@
Map<ActivityId, IActivity> activityNodeMap = jag.getActivityMap();
List<ActivityCluster> acList = new ArrayList<ActivityCluster>();
for (Set<ActivityId> stage : stages) {
- ActivityCluster ac = new ActivityCluster(acg, new ActivityClusterId(jobId, acCounter++));
+ ActivityCluster ac = new ActivityCluster(acg, new ActivityClusterId(acCounter++));
acList.add(ac);
for (ActivityId aid : stage) {
IActivity activity = activityNodeMap.get(aid);
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobSpecificationActivityClusterGraphGeneratorFactory.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobSpecificationActivityClusterGraphGeneratorFactory.java
index c712b36..ddf0ce8 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobSpecificationActivityClusterGraphGeneratorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/client/impl/JobSpecificationActivityClusterGraphGeneratorFactory.java
@@ -32,7 +32,6 @@
import org.apache.hyracks.api.job.IActivityClusterGraphGeneratorFactory;
import org.apache.hyracks.api.job.JobActivityGraph;
import org.apache.hyracks.api.job.JobFlag;
-import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.rewriter.ActivityClusterGraphRewriter;
@@ -51,8 +50,8 @@
}
@Override
- public IActivityClusterGraphGenerator createActivityClusterGraphGenerator(JobId jobId,
- final ICCServiceContext ccServiceCtx, Set<JobFlag> jobFlags) throws HyracksException {
+ public IActivityClusterGraphGenerator createActivityClusterGraphGenerator(final ICCServiceContext ccServiceCtx,
+ Set<JobFlag> jobFlags) throws HyracksException {
final JobActivityGraphBuilder builder = new JobActivityGraphBuilder(spec, jobFlags);
PlanUtils.visit(spec, new IConnectorDescriptorVisitor() {
@Override
@@ -70,7 +69,7 @@
final JobActivityGraph jag = builder.getActivityGraph();
ActivityClusterGraphBuilder acgb = new ActivityClusterGraphBuilder();
- final ActivityClusterGraph acg = acgb.inferActivityClusters(jobId, jag);
+ final ActivityClusterGraph acg = acgb.inferActivityClusters(jag);
acg.setFrameSize(spec.getFrameSize());
acg.setMaxReattempts(spec.getMaxReattempts());
acg.setJobletEventListenerFactory(spec.getJobletEventListenerFactory());
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksJobletContext.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksJobletContext.java
index 6eb0adb..1100335 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksJobletContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksJobletContext.java
@@ -21,6 +21,7 @@
import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.io.IWorkspaceFileFactory;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.profiling.counters.ICounterContext;
import org.apache.hyracks.api.resources.IDeallocatableRegistry;
@@ -34,6 +35,8 @@
Object getGlobalJobData();
+ IJobletEventListenerFactory getJobletEventListenerFactory();
+
Class<?> loadClass(String className) throws HyracksException;
ClassLoader getClassLoader() throws HyracksException;
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
index 10bb336..bf42d0c 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/context/IHyracksTaskContext.java
@@ -25,6 +25,7 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.dataset.IDatasetPartitionManager;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.io.IWorkspaceFileFactory;
import org.apache.hyracks.api.job.IOperatorEnvironment;
import org.apache.hyracks.api.job.JobFlag;
@@ -52,6 +53,8 @@
Object getSharedObject();
+ public byte[] getJobParameter(byte[] name, int start, int length) throws HyracksException;
+
Set<JobFlag> getJobFlags();
IStatsCollector getStatsCollector();
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/TaskAttemptId.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/TaskAttemptId.java
index 782561b..bb3b3c8 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/TaskAttemptId.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/dataflow/TaskAttemptId.java
@@ -25,7 +25,7 @@
import org.apache.hyracks.api.io.IWritable;
-public final class TaskAttemptId implements IWritable, Serializable {
+public class TaskAttemptId implements IWritable, Serializable {
private static final long serialVersionUID = 1L;
private TaskId taskId;
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
index 7926469..eaf9bbf 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/exceptions/ErrorCode.java
@@ -54,9 +54,9 @@
public static final int INCONSISTENT_RESULT_METADATA = 18;
public static final int CANNOT_DELETE_FILE = 19;
public static final int NOT_A_JOBID = 20;
- public static final int ERROR_FINDING_DISTRIBUTED_JOB = 21;
- public static final int DUPLICATE_DISTRIBUTED_JOB = 22;
- public static final int DISTRIBUTED_JOB_FAILURE = 23;
+ public static final int ERROR_FINDING_DEPLOYED_JOB = 21;
+ public static final int DUPLICATE_DEPLOYED_JOB = 22;
+ public static final int DEPLOYED_JOB_FAILURE = 23;
public static final int NO_RESULT_SET = 24;
public static final int JOB_CANCELED = 25;
public static final int NODE_FAILED = 26;
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterId.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterId.java
index e0c5279..84a754a 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterId.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/ActivityClusterId.java
@@ -23,19 +23,12 @@
public final class ActivityClusterId implements Serializable {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
-
private final int id;
- public ActivityClusterId(JobId jobId, int id) {
- this.jobId = jobId;
+ public ActivityClusterId(int id) {
this.id = id;
}
- public JobId getJobId() {
- return jobId;
- }
-
public int getId() {
return id;
}
@@ -45,7 +38,6 @@
final int prime = 31;
int result = 1;
result = prime * result + id;
- result = prime * result + ((jobId == null) ? 0 : jobId.hashCode());
return result;
}
@@ -64,18 +56,11 @@
if (id != other.id) {
return false;
}
- if (jobId == null) {
- if (other.jobId != null) {
- return false;
- }
- } else if (!jobId.equals(other.jobId)) {
- return false;
- }
return true;
}
@Override
public String toString() {
- return "ACID:" + jobId + ":" + id;
+ return "ACID:" + id;
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/DeployedJobSpecId.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/DeployedJobSpecId.java
new file mode 100644
index 0000000..8cbfb1a
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/DeployedJobSpecId.java
@@ -0,0 +1,91 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.api.job;
+
+import java.io.DataInput;
+import java.io.DataOutput;
+import java.io.IOException;
+import java.io.Serializable;
+
+import org.apache.hyracks.api.exceptions.ErrorCode;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.api.io.IWritable;
+
+public final class DeployedJobSpecId implements IWritable, Serializable {
+
+ public static final DeployedJobSpecId INVALID = new DeployedJobSpecId(-1l);
+
+ private static final long serialVersionUID = 1L;
+ private long id;
+
+ public static DeployedJobSpecId create(DataInput dis) throws IOException {
+ DeployedJobSpecId deployedJobSpecId = new DeployedJobSpecId();
+ deployedJobSpecId.readFields(dis);
+ return deployedJobSpecId;
+ }
+
+ private DeployedJobSpecId() {
+ }
+
+ public DeployedJobSpecId(long id) {
+ this.id = id;
+ }
+
+ public long getId() {
+ return id;
+ }
+
+ @Override
+ public int hashCode() {
+ return (int) id;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (o == this) {
+ return true;
+ }
+ if (!(o instanceof DeployedJobSpecId)) {
+ return false;
+ }
+ return ((DeployedJobSpecId) o).id == id;
+ }
+
+ @Override
+ public String toString() {
+ return "PDJID:" + id;
+ }
+
+ public static DeployedJobSpecId parse(String str) throws HyracksDataException {
+ if (str.startsWith("PDJID:")) {
+ return new DeployedJobSpecId(Long.parseLong(str.substring(4)));
+ }
+ throw HyracksDataException.create(ErrorCode.NOT_A_JOBID, str);
+ }
+
+ @Override
+ public void writeFields(DataOutput output) throws IOException {
+ output.writeLong(id);
+ }
+
+ @Override
+ public void readFields(DataInput input) throws IOException {
+ id = input.readLong();
+ }
+}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/DeployedJobSpecIdFactory.java
similarity index 68%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
copy to hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/DeployedJobSpecIdFactory.java
index 7a17743..24caa9b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/DeployedJobSpecIdFactory.java
@@ -16,15 +16,19 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
+package org.apache.hyracks.api.job;
-use dataverse test;
+import java.util.concurrent.atomic.AtomicLong;
-for $a in dataset('t1')
-where $a.unique1 > 10 and $a.stringu1="DGAAAAXXXXXXXXXXXXXXXXXXX"
-return $a
+public class DeployedJobSpecIdFactory {
+ private final AtomicLong id = new AtomicLong(0);
+
+ public DeployedJobSpecId create() {
+ return new DeployedJobSpecId(id.getAndIncrement());
+ }
+
+ public long maxDeployedJobSpecId() {
+ return id.get();
+ }
+
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java
index 133e342..d23b944 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IActivityClusterGraphGeneratorFactory.java
@@ -25,7 +25,7 @@
import org.apache.hyracks.api.exceptions.HyracksException;
public interface IActivityClusterGraphGeneratorFactory extends Serializable {
- public IActivityClusterGraphGenerator createActivityClusterGraphGenerator(JobId jobId,
+ public IActivityClusterGraphGenerator createActivityClusterGraphGenerator(
ICCServiceContext ccServiceCtx, Set<JobFlag> jobFlags) throws HyracksException;
public JobSpecification getJobSpecification();
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IJobletEventListenerFactory.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IJobletEventListenerFactory.java
index d523cccc..bd2f189 100644
--- a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IJobletEventListenerFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/IJobletEventListenerFactory.java
@@ -23,5 +23,10 @@
import org.apache.hyracks.api.context.IHyracksJobletContext;
public interface IJobletEventListenerFactory extends Serializable {
- public IJobletEventListener createListener(IHyracksJobletContext ctx);
+ IJobletEventListener createListener(IHyracksJobletContext ctx);
+
+ IJobletEventListenerFactory copyFactory();
+
+ //Allows job parameters to change listener settings
+ void updateListenerJobParameters(JobParameterByteStore jobParameterByteStore);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobParameterByteStore.java b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobParameterByteStore.java
new file mode 100644
index 0000000..551b3d7
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-api/src/main/java/org/apache/hyracks/api/job/JobParameterByteStore.java
@@ -0,0 +1,64 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.api.job;
+
+import java.io.Serializable;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+public class JobParameterByteStore implements Serializable {
+
+ private static final long serialVersionUID = 1L;
+
+ private Map<byte[], byte[]> runtimeValues;
+ private final byte[] empty = new byte[0];
+
+ public JobParameterByteStore() {
+ runtimeValues = new HashMap<>();
+ }
+
+ public Map<byte[], byte[]> getParameterMap() {
+ return runtimeValues;
+ }
+
+ public void setParameters(Map<byte[], byte[]> map) {
+ runtimeValues = map;
+ }
+
+ public byte[] getParameterValue(byte[] name, int start, int length) {
+ for (Entry<byte[], byte[]> entry : runtimeValues.entrySet()) {
+ byte[] key = entry.getKey();
+ if (key.length == length) {
+ boolean matched = true;
+ for (int j = 0; j < length; j++) {
+ if (key[j] != name[j + start]) {
+ matched = false;
+ break;
+ }
+ }
+ if (matched) {
+ return entry.getValue();
+ }
+ }
+ }
+ return empty;
+ }
+
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java
index 327c422..4e3c0f5 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClientInterfaceIPCI.java
@@ -24,15 +24,15 @@
import org.apache.hyracks.api.client.HyracksClientInterfaceFunctions;
import org.apache.hyracks.api.comm.NetworkAddress;
import org.apache.hyracks.api.dataset.DatasetJobRecord.Status;
-import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
+import org.apache.hyracks.api.job.DeployedJobSpecIdFactory;
import org.apache.hyracks.api.job.JobIdFactory;
import org.apache.hyracks.api.job.JobInfo;
import org.apache.hyracks.control.cc.work.CancelJobWork;
import org.apache.hyracks.control.cc.work.CliDeployBinaryWork;
import org.apache.hyracks.control.cc.work.CliUnDeployBinaryWork;
import org.apache.hyracks.control.cc.work.ClusterShutdownWork;
-import org.apache.hyracks.control.cc.work.DestroyJobWork;
-import org.apache.hyracks.control.cc.work.DistributeJobWork;
+import org.apache.hyracks.control.cc.work.DeployJobSpecWork;
import org.apache.hyracks.control.cc.work.GetDatasetDirectoryServiceInfoWork;
import org.apache.hyracks.control.cc.work.GetJobInfoWork;
import org.apache.hyracks.control.cc.work.GetJobStatusWork;
@@ -42,6 +42,7 @@
import org.apache.hyracks.control.cc.work.GetResultStatusWork;
import org.apache.hyracks.control.cc.work.GetThreadDumpWork;
import org.apache.hyracks.control.cc.work.JobStartWork;
+import org.apache.hyracks.control.cc.work.UndeployJobSpecWork;
import org.apache.hyracks.control.cc.work.WaitForJobCompletionWork;
import org.apache.hyracks.control.common.work.IPCResponder;
import org.apache.hyracks.ipc.api.IIPCHandle;
@@ -53,10 +54,12 @@
private static final Logger LOGGER = Logger.getLogger(ClientInterfaceIPCI.class.getName());
private final ClusterControllerService ccs;
private final JobIdFactory jobIdFactory;
+ private final DeployedJobSpecIdFactory deployedJobSpecIdFactory;
- ClientInterfaceIPCI(ClusterControllerService ccs, JobIdFactory jobIdFactory) {
+ ClientInterfaceIPCI(final ClusterControllerService ccs, final JobIdFactory jobIdFactory) {
this.ccs = ccs;
this.jobIdFactory = jobIdFactory;
+ this.deployedJobSpecIdFactory = ccs.getDeployedJobSpecIdFactory();
}
@Override
@@ -83,16 +86,17 @@
new IPCResponder<JobInfo>(handle, mid)));
break;
case DISTRIBUTE_JOB:
- HyracksClientInterfaceFunctions.DistributeJobFunction djf =
- (HyracksClientInterfaceFunctions.DistributeJobFunction) fn;
- ccs.getWorkQueue().schedule(new DistributeJobWork(ccs, djf.getACGGFBytes(), jobIdFactory,
- new IPCResponder<JobId>(handle, mid)));
+ HyracksClientInterfaceFunctions.DeployJobSpecFunction djf =
+ (HyracksClientInterfaceFunctions.DeployJobSpecFunction) fn;
+ ccs.getWorkQueue().schedule(new DeployJobSpecWork(ccs, djf.getACGGFBytes(),
+ deployedJobSpecIdFactory.create(), new IPCResponder<>(handle, mid)));
break;
case DESTROY_JOB:
- HyracksClientInterfaceFunctions.DestroyJobFunction dsjf =
- (HyracksClientInterfaceFunctions.DestroyJobFunction) fn;
+ HyracksClientInterfaceFunctions.UndeployJobSpecFunction dsjf =
+ (HyracksClientInterfaceFunctions.UndeployJobSpecFunction) fn;
ccs.getWorkQueue()
- .schedule(new DestroyJobWork(ccs, dsjf.getJobId(), new IPCResponder<JobId>(handle, mid)));
+ .schedule(new UndeployJobSpecWork(ccs, dsjf.getDeployedJobSpecId(),
+ new IPCResponder<>(handle, mid)));
break;
case CANCEL_JOB:
HyracksClientInterfaceFunctions.CancelJobFunction cjf =
@@ -103,8 +107,14 @@
case START_JOB:
HyracksClientInterfaceFunctions.StartJobFunction sjf =
(HyracksClientInterfaceFunctions.StartJobFunction) fn;
- ccs.getWorkQueue().schedule(new JobStartWork(ccs, sjf.getDeploymentId(), sjf.getACGGFBytes(),
- sjf.getJobFlags(), sjf.getJobId(), new IPCResponder<JobId>(handle, mid), jobIdFactory));
+ DeployedJobSpecId id = sjf.getDeployedJobSpecId();
+ byte[] acggfBytes = null;
+ if (id == null) {
+ //The job is new
+ acggfBytes = sjf.getACGGFBytes();
+ }
+ ccs.getWorkQueue().schedule(new JobStartWork(ccs, sjf.getDeploymentId(), acggfBytes, sjf.getJobFlags(),
+ jobIdFactory, sjf.getJobParameters(), new IPCResponder<>(handle, mid), id));
break;
case GET_DATASET_DIRECTORY_SERIVICE_INFO:
ccs.getWorkQueue().schedule(
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java
index af5c102..5a53fce 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerIPCI.java
@@ -23,7 +23,7 @@
import org.apache.hyracks.api.client.NodeControllerInfo;
import org.apache.hyracks.control.cc.work.ApplicationMessageWork;
-import org.apache.hyracks.control.cc.work.DistributedJobFailureWork;
+import org.apache.hyracks.control.cc.work.DeployedJobFailureWork;
import org.apache.hyracks.control.cc.work.GetNodeControllersInfoWork;
import org.apache.hyracks.control.cc.work.JobletCleanupNotificationWork;
import org.apache.hyracks.control.cc.work.NodeHeartbeatWork;
@@ -76,13 +76,12 @@
break;
case NOTIFY_JOBLET_CLEANUP:
CCNCFunctions.NotifyJobletCleanupFunction njcf = (CCNCFunctions.NotifyJobletCleanupFunction) fn;
- ccs.getWorkQueue().schedule(new JobletCleanupNotificationWork(ccs, njcf.getJobId(),
- njcf.getNodeId()));
+ ccs.getWorkQueue().schedule(new JobletCleanupNotificationWork(ccs, njcf.getJobId(), njcf.getNodeId()));
break;
case NOTIFY_DEPLOY_BINARY:
CCNCFunctions.NotifyDeployBinaryFunction ndbf = (CCNCFunctions.NotifyDeployBinaryFunction) fn;
- ccs.getWorkQueue().schedule(new NotifyDeployBinaryWork(ccs, ndbf.getDeploymentId(),
- ndbf.getNodeId(), ndbf.getDeploymentStatus()));
+ ccs.getWorkQueue().schedule(new NotifyDeployBinaryWork(ccs, ndbf.getDeploymentId(), ndbf.getNodeId(),
+ ndbf.getDeploymentStatus()));
break;
case REPORT_PROFILE:
CCNCFunctions.ReportProfileFunction rpf = (CCNCFunctions.ReportProfileFunction) fn;
@@ -90,49 +89,48 @@
break;
case NOTIFY_TASK_COMPLETE:
CCNCFunctions.NotifyTaskCompleteFunction ntcf = (CCNCFunctions.NotifyTaskCompleteFunction) fn;
- ccs.getWorkQueue().schedule(new TaskCompleteWork(ccs, ntcf.getJobId(),
- ntcf.getTaskId(), ntcf.getNodeId(), ntcf.getStatistics()));
+ ccs.getWorkQueue().schedule(new TaskCompleteWork(ccs, ntcf.getJobId(), ntcf.getTaskId(),
+ ntcf.getNodeId(), ntcf.getStatistics()));
break;
case NOTIFY_TASK_FAILURE:
CCNCFunctions.NotifyTaskFailureFunction ntff = (CCNCFunctions.NotifyTaskFailureFunction) fn;
- ccs.getWorkQueue().schedule(new TaskFailureWork(ccs, ntff.getJobId(),
- ntff.getTaskId(), ntff.getNodeId(), ntff.getExceptions()));
+ ccs.getWorkQueue().schedule(new TaskFailureWork(ccs, ntff.getJobId(), ntff.getTaskId(),
+ ntff.getNodeId(), ntff.getExceptions()));
break;
- case DISTRIBUTED_JOB_FAILURE:
- CCNCFunctions.ReportDistributedJobFailureFunction rdjf =
- (CCNCFunctions.ReportDistributedJobFailureFunction) fn;
- ccs.getWorkQueue().schedule(new DistributedJobFailureWork(rdjf.getJobId(), rdjf.getNodeId()));
+ case DEPLOYED_JOB_FAILURE:
+ CCNCFunctions.ReportDeployedJobSpecFailureFunction rdjf =
+ (CCNCFunctions.ReportDeployedJobSpecFailureFunction) fn;
+ ccs.getWorkQueue()
+ .schedule(new DeployedJobFailureWork(rdjf.getDeployedJobSpecId(), rdjf.getNodeId()));
break;
case REGISTER_PARTITION_PROVIDER:
CCNCFunctions.RegisterPartitionProviderFunction rppf =
(CCNCFunctions.RegisterPartitionProviderFunction) fn;
- ccs.getWorkQueue().schedule(new RegisterPartitionAvailibilityWork(ccs,
- rppf.getPartitionDescriptor()));
+ ccs.getWorkQueue().schedule(new RegisterPartitionAvailibilityWork(ccs, rppf.getPartitionDescriptor()));
break;
case REGISTER_PARTITION_REQUEST:
CCNCFunctions.RegisterPartitionRequestFunction rprf =
(CCNCFunctions.RegisterPartitionRequestFunction) fn;
- ccs.getWorkQueue().schedule(new RegisterPartitionRequestWork(ccs,
- rprf.getPartitionRequest()));
+ ccs.getWorkQueue().schedule(new RegisterPartitionRequestWork(ccs, rprf.getPartitionRequest()));
break;
case REGISTER_RESULT_PARTITION_LOCATION:
CCNCFunctions.RegisterResultPartitionLocationFunction rrplf =
(CCNCFunctions.RegisterResultPartitionLocationFunction) fn;
- ccs.getWorkQueue().schedule(new RegisterResultPartitionLocationWork(ccs,
- rrplf.getJobId(), rrplf.getResultSetId(), rrplf.getOrderedResult(), rrplf.getEmptyResult(),
- rrplf.getPartition(), rrplf.getNPartitions(), rrplf.getNetworkAddress()));
+ ccs.getWorkQueue()
+ .schedule(new RegisterResultPartitionLocationWork(ccs, rrplf.getJobId(), rrplf.getResultSetId(),
+ rrplf.getOrderedResult(), rrplf.getEmptyResult(), rrplf.getPartition(),
+ rrplf.getNPartitions(), rrplf.getNetworkAddress()));
break;
case REPORT_RESULT_PARTITION_WRITE_COMPLETION:
CCNCFunctions.ReportResultPartitionWriteCompletionFunction rrpwc =
(CCNCFunctions.ReportResultPartitionWriteCompletionFunction) fn;
- ccs.getWorkQueue().schedule(new ReportResultPartitionWriteCompletionWork(ccs,
- rrpwc.getJobId(), rrpwc.getResultSetId(), rrpwc.getPartition()));
+ ccs.getWorkQueue().schedule(new ReportResultPartitionWriteCompletionWork(ccs, rrpwc.getJobId(),
+ rrpwc.getResultSetId(), rrpwc.getPartition()));
break;
case SEND_APPLICATION_MESSAGE:
- CCNCFunctions.SendApplicationMessageFunction rsf =
- (CCNCFunctions.SendApplicationMessageFunction) fn;
- ccs.getWorkQueue().schedule(new ApplicationMessageWork(ccs, rsf.getMessage(),
- rsf.getDeploymentId(), rsf.getNodeId()));
+ CCNCFunctions.SendApplicationMessageFunction rsf = (CCNCFunctions.SendApplicationMessageFunction) fn;
+ ccs.getWorkQueue().schedule(
+ new ApplicationMessageWork(ccs, rsf.getMessage(), rsf.getDeploymentId(), rsf.getNodeId()));
break;
case GET_NODE_CONTROLLERS_INFO:
ccs.getWorkQueue().schedule(new GetNodeControllersInfoWork(ccs.getNodeManager(),
@@ -150,18 +148,17 @@
break;
case STATE_DUMP_RESPONSE:
CCNCFunctions.StateDumpResponseFunction dsrf = (StateDumpResponseFunction) fn;
- ccs.getWorkQueue().schedule(new NotifyStateDumpResponse(ccs, dsrf.getNodeId(),
- dsrf.getStateDumpId(), dsrf.getState()));
+ ccs.getWorkQueue().schedule(
+ new NotifyStateDumpResponse(ccs, dsrf.getNodeId(), dsrf.getStateDumpId(), dsrf.getState()));
break;
case SHUTDOWN_RESPONSE:
CCNCFunctions.ShutdownResponseFunction sdrf = (ShutdownResponseFunction) fn;
ccs.getWorkQueue().schedule(new NotifyShutdownWork(ccs, sdrf.getNodeId()));
break;
case THREAD_DUMP_RESPONSE:
- CCNCFunctions.ThreadDumpResponseFunction tdrf =
- (CCNCFunctions.ThreadDumpResponseFunction)fn;
- ccs.getWorkQueue().schedule(new NotifyThreadDumpResponse(ccs,
- tdrf.getRequestId(), tdrf.getThreadDumpJSON()));
+ CCNCFunctions.ThreadDumpResponseFunction tdrf = (CCNCFunctions.ThreadDumpResponseFunction) fn;
+ ccs.getWorkQueue()
+ .schedule(new NotifyThreadDumpResponse(ccs, tdrf.getRequestId(), tdrf.getThreadDumpJSON()));
break;
default:
LOGGER.warning("Unknown function: " + fn.getFunctionId());
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
index 7b99df2..713bddd 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/ClusterControllerService.java
@@ -50,7 +50,10 @@
import org.apache.hyracks.api.deployment.DeploymentId;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.job.DeployedJobSpecIdFactory;
+import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobIdFactory;
+import org.apache.hyracks.api.job.JobParameterByteStore;
import org.apache.hyracks.api.job.resource.IJobCapacityController;
import org.apache.hyracks.api.service.IControllerService;
import org.apache.hyracks.api.topology.ClusterTopology;
@@ -107,7 +110,9 @@
private CCServiceContext serviceCtx;
- private final PreDistributedJobStore preDistributedJobStore = new PreDistributedJobStore();
+ private final DeployedJobSpecStore deployedJobSpecStore = new DeployedJobSpecStore();
+
+ private final Map<JobId, JobParameterByteStore> jobParameterByteStoreMap = new HashMap<>();
private final WorkQueue workQueue;
@@ -135,6 +140,8 @@
private final JobIdFactory jobIdFactory;
+ private final DeployedJobSpecIdFactory deployedJobSpecIdFactory;
+
private IJobManager jobManager;
private ShutdownRun shutdownCallback;
@@ -164,8 +171,8 @@
final ClusterTopology topology = computeClusterTopology(ccConfig);
ccContext = new ClusterControllerContext(topology);
sweeper = new DeadNodeSweeper();
- datasetDirectoryService = new DatasetDirectoryService(ccConfig.getResultTTL(),
- ccConfig.getResultSweepThreshold(), preDistributedJobStore);
+ datasetDirectoryService =
+ new DatasetDirectoryService(ccConfig.getResultTTL(), ccConfig.getResultSweepThreshold());
deploymentRunMap = new HashMap<>();
stateDumpRunMap = new HashMap<>();
@@ -175,6 +182,8 @@
nodeManager = new NodeManager(this, ccConfig, resourceManager);
jobIdFactory = new JobIdFactory();
+
+ deployedJobSpecIdFactory = new DeployedJobSpecIdFactory();
}
private static ClusterTopology computeClusterTopology(CCConfig ccConfig) throws Exception {
@@ -347,8 +356,21 @@
return nodeManager;
}
- public PreDistributedJobStore getPreDistributedJobStore() throws HyracksException {
- return preDistributedJobStore;
+ public DeployedJobSpecStore getDeployedJobSpecStore() throws HyracksException {
+ return deployedJobSpecStore;
+ }
+
+ public void removeJobParameterByteStore(JobId jobId) throws HyracksException {
+ jobParameterByteStoreMap.remove(jobId);
+ }
+
+ public JobParameterByteStore createOrGetJobParameterByteStore(JobId jobId) throws HyracksException {
+ JobParameterByteStore jpbs = jobParameterByteStoreMap.get(jobId);
+ if (jpbs == null) {
+ jpbs = new JobParameterByteStore();
+ jobParameterByteStoreMap.put(jobId, jpbs);
+ }
+ return jpbs;
}
public IResourceManager getResourceManager() {
@@ -397,6 +419,10 @@
return jobIdFactory;
}
+ public DeployedJobSpecIdFactory getDeployedJobSpecIdFactory() {
+ return deployedJobSpecIdFactory;
+ }
+
private final class ClusterControllerContext implements ICCContext {
private final ClusterTopology topology;
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java
new file mode 100644
index 0000000..1a3051e
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/DeployedJobSpecStore.java
@@ -0,0 +1,102 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.control.cc;
+
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.hyracks.api.constraints.Constraint;
+import org.apache.hyracks.api.exceptions.ErrorCode;
+import org.apache.hyracks.api.exceptions.HyracksException;
+import org.apache.hyracks.api.job.ActivityClusterGraph;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
+import org.apache.hyracks.api.job.JobSpecification;
+
+public class DeployedJobSpecStore {
+
+ private final Map<DeployedJobSpecId, DeployedJobSpecDescriptor> deployedJobSpecDescriptorMap;
+
+ public DeployedJobSpecStore() {
+ deployedJobSpecDescriptorMap = new Hashtable<>();
+ }
+
+ public void addDeployedJobSpecDescriptor(DeployedJobSpecId deployedJobSpecId,
+ ActivityClusterGraph activityClusterGraph,
+ JobSpecification jobSpecification, Set<Constraint> activityClusterGraphConstraints)
+ throws HyracksException {
+ if (deployedJobSpecDescriptorMap.get(deployedJobSpecId) != null) {
+ throw HyracksException.create(ErrorCode.DUPLICATE_DEPLOYED_JOB, deployedJobSpecId);
+ }
+ DeployedJobSpecDescriptor descriptor =
+ new DeployedJobSpecDescriptor(activityClusterGraph, jobSpecification, activityClusterGraphConstraints);
+ deployedJobSpecDescriptorMap.put(deployedJobSpecId, descriptor);
+ }
+
+ public void checkForExistingDeployedJobSpecDescriptor(DeployedJobSpecId deployedJobSpecId) throws HyracksException {
+ if (deployedJobSpecDescriptorMap.get(deployedJobSpecId) != null) {
+ throw HyracksException.create(ErrorCode.DUPLICATE_DEPLOYED_JOB, deployedJobSpecId);
+ }
+ }
+
+ public DeployedJobSpecDescriptor getDeployedJobSpecDescriptor(DeployedJobSpecId deployedJobSpecId)
+ throws HyracksException {
+ DeployedJobSpecDescriptor descriptor = deployedJobSpecDescriptorMap.get(deployedJobSpecId);
+ if (descriptor == null) {
+ throw HyracksException.create(ErrorCode.ERROR_FINDING_DEPLOYED_JOB, deployedJobSpecId);
+ }
+ return descriptor;
+ }
+
+ public void removeDeployedJobSpecDescriptor(DeployedJobSpecId deployedJobSpecId) throws HyracksException {
+ DeployedJobSpecDescriptor descriptor = deployedJobSpecDescriptorMap.get(deployedJobSpecId);
+ if (descriptor == null) {
+ throw HyracksException.create(ErrorCode.ERROR_FINDING_DEPLOYED_JOB, deployedJobSpecId);
+ }
+ deployedJobSpecDescriptorMap.remove(deployedJobSpecId);
+ }
+
+ public class DeployedJobSpecDescriptor {
+
+ private final ActivityClusterGraph activityClusterGraph;
+
+ private final JobSpecification jobSpecification;
+
+ private final Set<Constraint> activityClusterGraphConstraints;
+
+ private DeployedJobSpecDescriptor(ActivityClusterGraph activityClusterGraph,
+ JobSpecification jobSpecification, Set<Constraint> activityClusterGraphConstraints) {
+ this.activityClusterGraph = activityClusterGraph;
+ this.jobSpecification = jobSpecification;
+ this.activityClusterGraphConstraints = activityClusterGraphConstraints;
+ }
+
+ public ActivityClusterGraph getActivityClusterGraph() {
+ return activityClusterGraph;
+ }
+
+ public JobSpecification getJobSpecification() {
+ return jobSpecification;
+ }
+
+ public Set<Constraint> getActivityClusterGraphConstraints() {
+ return activityClusterGraphConstraints;
+ }
+ }
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/PreDistributedJobStore.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/PreDistributedJobStore.java
deleted file mode 100644
index 117621f..0000000
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/PreDistributedJobStore.java
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hyracks.control.cc;
-
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.Set;
-
-import org.apache.hyracks.api.constraints.Constraint;
-import org.apache.hyracks.api.exceptions.ErrorCode;
-import org.apache.hyracks.api.exceptions.HyracksException;
-import org.apache.hyracks.api.job.ActivityClusterGraph;
-import org.apache.hyracks.api.job.JobId;
-import org.apache.hyracks.api.job.JobSpecification;
-
-public class PreDistributedJobStore {
-
- private final Map<JobId, PreDistributedJobDescriptor> preDistributedJobDescriptorMap;
-
- public PreDistributedJobStore() {
- preDistributedJobDescriptorMap = new Hashtable<>();
- }
-
- public void addDistributedJobDescriptor(JobId jobId, ActivityClusterGraph activityClusterGraph,
- JobSpecification jobSpecification, Set<Constraint> activityClusterGraphConstraints)
- throws HyracksException {
- if (preDistributedJobDescriptorMap.get(jobId) != null) {
- throw HyracksException.create(ErrorCode.DUPLICATE_DISTRIBUTED_JOB, jobId);
- }
- PreDistributedJobDescriptor descriptor =
- new PreDistributedJobDescriptor(activityClusterGraph, jobSpecification, activityClusterGraphConstraints);
- preDistributedJobDescriptorMap.put(jobId, descriptor);
- }
-
- public void checkForExistingDistributedJobDescriptor(JobId jobId) throws HyracksException {
- if (preDistributedJobDescriptorMap.get(jobId) != null) {
- throw HyracksException.create(ErrorCode.DUPLICATE_DISTRIBUTED_JOB, jobId);
- }
- }
-
- public PreDistributedJobDescriptor getDistributedJobDescriptor(JobId jobId) throws HyracksException {
- PreDistributedJobDescriptor descriptor = preDistributedJobDescriptorMap.get(jobId);
- if (descriptor == null) {
- throw HyracksException.create(ErrorCode.ERROR_FINDING_DISTRIBUTED_JOB, jobId);
- }
- return descriptor;
- }
-
- public boolean jobIsPredistributed(JobId jobId) {
- return preDistributedJobDescriptorMap.get(jobId) != null;
- }
-
- public void removeDistributedJobDescriptor(JobId jobId) throws HyracksException {
- PreDistributedJobDescriptor descriptor = preDistributedJobDescriptorMap.get(jobId);
- if (descriptor == null) {
- throw HyracksException.create(ErrorCode.ERROR_FINDING_DISTRIBUTED_JOB, jobId);
- }
- preDistributedJobDescriptorMap.remove(jobId);
- }
-
- public class PreDistributedJobDescriptor {
-
- private final ActivityClusterGraph activityClusterGraph;
-
- private final JobSpecification jobSpecification;
-
- private final Set<Constraint> activityClusterGraphConstraints;
-
- private PreDistributedJobDescriptor(ActivityClusterGraph activityClusterGraph,
- JobSpecification jobSpecification, Set<Constraint> activityClusterGraphConstraints) {
- this.activityClusterGraph = activityClusterGraph;
- this.jobSpecification = jobSpecification;
- this.activityClusterGraphConstraints = activityClusterGraphConstraints;
- }
-
- public ActivityClusterGraph getActivityClusterGraph() {
- return activityClusterGraph;
- }
-
- public JobSpecification getJobSpecification() {
- return jobSpecification;
- }
-
- public Set<Constraint> getActivityClusterGraphConstraints() {
- return activityClusterGraphConstraints;
- }
- }
-}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java
index 3cd6235..4928564 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/cluster/NodeManager.java
@@ -136,7 +136,7 @@
public Map<String, NodeControllerInfo> getNodeControllerInfoMap() {
Map<String, NodeControllerInfo> result = new LinkedHashMap<>();
nodeRegistry.forEach(
- (key, ncState) -> result.put(key, new NodeControllerInfo(key, NodeStatus.ALIVE, ncState.getDataPort(),
+ (key, ncState) -> result.put(key, new NodeControllerInfo(key, NodeStatus.ACTIVE, ncState.getDataPort(),
ncState.getDatasetPort(), ncState.getMessagingPort(), ncState.getCapacity().getCores())));
return result;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
index ca1c91b..1cb07d0 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/dataset/DatasetDirectoryService.java
@@ -42,7 +42,6 @@
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobSpecification;
import org.apache.hyracks.api.job.JobStatus;
-import org.apache.hyracks.control.cc.PreDistributedJobStore;
import org.apache.hyracks.control.common.dataset.ResultStateSweeper;
import org.apache.hyracks.control.common.work.IResultCallback;
@@ -63,14 +62,10 @@
private final Map<JobId, JobResultInfo> jobResultLocations;
- private final PreDistributedJobStore preDistributedJobStore;
-
- public DatasetDirectoryService(long resultTTL, long resultSweepThreshold,
- PreDistributedJobStore preDistributedJobStore) {
+ public DatasetDirectoryService(long resultTTL, long resultSweepThreshold) {
this.resultTTL = resultTTL;
this.resultSweepThreshold = resultSweepThreshold;
- this.preDistributedJobStore = preDistributedJobStore;
- jobResultLocations = new LinkedHashMap<>();
+ jobResultLocations = new LinkedHashMap<JobId, JobResultInfo>();
}
@Override
@@ -186,9 +181,6 @@
@Override
public synchronized long getResultTimestamp(JobId jobId) {
- if (preDistributedJobStore.jobIsPredistributed(jobId)) {
- return -1;
- }
return getState(jobId).getTimestamp();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java
index 8a69a6f..01201a6 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/executor/JobExecutor.java
@@ -47,6 +47,7 @@
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.job.ActivityCluster;
import org.apache.hyracks.api.job.ActivityClusterGraph;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobStatus;
import org.apache.hyracks.api.partitions.PartitionId;
@@ -77,7 +78,7 @@
private final PartitionConstraintSolver solver;
- private final boolean predistributed;
+ private final DeployedJobSpecId deployedJobSpecId;
private final Map<PartitionId, TaskCluster> partitionProducingTaskClusterMap;
@@ -88,10 +89,10 @@
private boolean cancelled = false;
public JobExecutor(ClusterControllerService ccs, JobRun jobRun, Collection<Constraint> constraints,
- boolean predistributed) {
+ DeployedJobSpecId deployedJobSpecId) {
this.ccs = ccs;
this.jobRun = jobRun;
- this.predistributed = predistributed;
+ this.deployedJobSpecId = deployedJobSpecId;
solver = new PartitionConstraintSolver();
partitionProducingTaskClusterMap = new HashMap<>();
inProgressTaskClusters = new HashSet<>();
@@ -99,8 +100,8 @@
random = new Random();
}
- public boolean isPredistributed() {
- return predistributed;
+ public boolean isDeployed() {
+ return deployedJobSpecId != null;
}
public JobRun getJobRun() {
@@ -446,7 +447,7 @@
Object location = solver.getValue(pLocationExpr);
if (location == null) {
// pick any
- nodeId = liveNodes.toArray(new String[liveNodes.size()])[random.nextInt(1) % liveNodes.size()];
+ nodeId = liveNodes.toArray(new String[liveNodes.size()])[random.nextInt(liveNodes.size())];
} else if (location instanceof String) {
nodeId = (String) location;
} else if (location instanceof String[]) {
@@ -502,7 +503,7 @@
new HashMap<>(jobRun.getConnectorPolicyMap());
INodeManager nodeManager = ccs.getNodeManager();
try {
- byte[] acgBytes = predistributed ? null : JavaSerializationUtils.serialize(acg);
+ byte[] acgBytes = isDeployed() ? null : JavaSerializationUtils.serialize(acg);
for (Map.Entry<String, List<TaskAttemptDescriptor>> entry : taskAttemptMap.entrySet()) {
String nodeId = entry.getKey();
final List<TaskAttemptDescriptor> taskDescriptors = entry.getValue();
@@ -515,7 +516,8 @@
}
byte[] jagBytes = changed ? acgBytes : null;
node.getNodeController().startTasks(deploymentId, jobId, jagBytes, taskDescriptors,
- connectorPolicies, jobRun.getFlags());
+ connectorPolicies, jobRun.getFlags(),
+ ccs.createOrGetJobParameterByteStore(jobId).getParameterMap(), deployedJobSpecId);
}
}
} catch (Exception e) {
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
index fa22dd3..26f8022 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobManager.java
@@ -142,6 +142,7 @@
@Override
public void prepareComplete(JobRun run, JobStatus status, List<Exception> exceptions) throws HyracksException {
+ ccs.removeJobParameterByteStore(run.getJobId());
checkJob(run);
if (status == JobStatus.FAILURE_BEFORE_EXECUTION) {
run.setPendingStatus(JobStatus.FAILURE, exceptions);
@@ -306,9 +307,7 @@
CCServiceContext serviceCtx = ccs.getContext();
JobSpecification spec = run.getJobSpecification();
- if (!run.getExecutor().isPredistributed()) {
- serviceCtx.notifyJobCreation(jobId, spec);
- }
+ serviceCtx.notifyJobCreation(jobId, spec);
run.setStatus(JobStatus.RUNNING, null);
executeJobInternal(run);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
index ef0bca2..58f44ef 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/job/JobRun.java
@@ -37,6 +37,7 @@
import org.apache.hyracks.api.job.ActivityCluster;
import org.apache.hyracks.api.job.ActivityClusterGraph;
import org.apache.hyracks.api.job.ActivityClusterId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.IActivityClusterGraphGenerator;
import org.apache.hyracks.api.job.IActivityClusterGraphGeneratorFactory;
import org.apache.hyracks.api.job.JobFlag;
@@ -45,7 +46,7 @@
import org.apache.hyracks.api.job.JobStatus;
import org.apache.hyracks.api.partitions.PartitionId;
import org.apache.hyracks.control.cc.ClusterControllerService;
-import org.apache.hyracks.control.cc.PreDistributedJobStore.PreDistributedJobDescriptor;
+import org.apache.hyracks.control.cc.DeployedJobSpecStore.DeployedJobSpecDescriptor;
import org.apache.hyracks.control.cc.executor.ActivityPartitionDetails;
import org.apache.hyracks.control.cc.executor.JobExecutor;
import org.apache.hyracks.control.cc.partitions.PartitionMatchMaker;
@@ -114,21 +115,23 @@
createTime = System.currentTimeMillis();
}
- //Run a Pre-distributed job by passing the JobId
+ //Run a deployed job spec
public JobRun(ClusterControllerService ccs, DeploymentId deploymentId, JobId jobId, Set<JobFlag> jobFlags,
- PreDistributedJobDescriptor distributedJobDescriptor)
+ DeployedJobSpecDescriptor deployedJobSpecDescriptor, Map<byte[], byte[]> jobParameters,
+ DeployedJobSpecId deployedJobSpecId)
throws HyracksException {
this(deploymentId, jobId, jobFlags,
- distributedJobDescriptor.getJobSpecification(), distributedJobDescriptor.getActivityClusterGraph());
- Set<Constraint> constaints = distributedJobDescriptor.getActivityClusterGraphConstraints();
- this.scheduler = new JobExecutor(ccs, this, constaints, true);
+ deployedJobSpecDescriptor.getJobSpecification(), deployedJobSpecDescriptor.getActivityClusterGraph());
+ ccs.createOrGetJobParameterByteStore(jobId).setParameters(jobParameters);
+ Set<Constraint> constaints = deployedJobSpecDescriptor.getActivityClusterGraphConstraints();
+ this.scheduler = new JobExecutor(ccs, this, constaints, deployedJobSpecId);
}
//Run a new job by creating an ActivityClusterGraph
public JobRun(ClusterControllerService ccs, DeploymentId deploymentId, JobId jobId,
IActivityClusterGraphGeneratorFactory acggf, IActivityClusterGraphGenerator acgg, Set<JobFlag> jobFlags) {
this(deploymentId, jobId, jobFlags, acggf.getJobSpecification(), acgg.initialize());
- this.scheduler = new JobExecutor(ccs, this, acgg.getConstraints(), false);
+ this.scheduler = new JobExecutor(ccs, this, acgg.getConstraints(), null);
}
public DeploymentId getDeploymentId() {
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DistributeJobWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java
similarity index 72%
rename from hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DistributeJobWork.java
rename to hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java
index 5a57b1b..f7335a8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DistributeJobWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployJobSpecWork.java
@@ -21,11 +21,10 @@
import java.util.EnumSet;
import org.apache.hyracks.api.job.ActivityClusterGraph;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.IActivityClusterGraphGenerator;
import org.apache.hyracks.api.job.IActivityClusterGraphGeneratorFactory;
import org.apache.hyracks.api.job.JobFlag;
-import org.apache.hyracks.api.job.JobId;
-import org.apache.hyracks.api.job.JobIdFactory;
import org.apache.hyracks.api.util.JavaSerializationUtils;
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.cc.NodeControllerState;
@@ -35,15 +34,15 @@
import org.apache.hyracks.control.common.work.IResultCallback;
import org.apache.hyracks.control.common.work.SynchronizableWork;
-public class DistributeJobWork extends SynchronizableWork {
+public class DeployJobSpecWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final byte[] acggfBytes;
- private final JobIdFactory jobIdFactory;
- private final IResultCallback<JobId> callback;
+ private final DeployedJobSpecId deployedJobSpecId;
+ private final IResultCallback<DeployedJobSpecId> callback;
- public DistributeJobWork(ClusterControllerService ccs, byte[] acggfBytes, JobIdFactory jobIdFactory,
- IResultCallback<JobId> callback) {
- this.jobIdFactory = jobIdFactory;
+ public DeployJobSpecWork(ClusterControllerService ccs, byte[] acggfBytes, DeployedJobSpecId deployedJobSpecId,
+ IResultCallback<DeployedJobSpecId> callback) {
+ this.deployedJobSpecId = deployedJobSpecId;
this.ccs = ccs;
this.acggfBytes = acggfBytes;
this.callback = callback;
@@ -52,27 +51,24 @@
@Override
protected void doRun() throws Exception {
try {
- JobId jobId = jobIdFactory.create();
final CCServiceContext ccServiceCtx = ccs.getContext();
- ccs.getPreDistributedJobStore().checkForExistingDistributedJobDescriptor(jobId);
+ ccs.getDeployedJobSpecStore().checkForExistingDeployedJobSpecDescriptor(deployedJobSpecId);
IActivityClusterGraphGeneratorFactory acggf =
(IActivityClusterGraphGeneratorFactory) DeploymentUtils.deserialize(acggfBytes, null, ccServiceCtx);
IActivityClusterGraphGenerator acgg =
- acggf.createActivityClusterGraphGenerator(jobId, ccServiceCtx, EnumSet.noneOf(JobFlag.class));
+ acggf.createActivityClusterGraphGenerator(ccServiceCtx, EnumSet.noneOf(JobFlag.class));
ActivityClusterGraph acg = acgg.initialize();
- ccs.getPreDistributedJobStore().addDistributedJobDescriptor(jobId, acg, acggf.getJobSpecification(),
+ ccs.getDeployedJobSpecStore().addDeployedJobSpecDescriptor(deployedJobSpecId, acg,
+ acggf.getJobSpecification(),
acgg.getConstraints());
- ccServiceCtx.notifyJobCreation(jobId, acggf.getJobSpecification());
-
byte[] acgBytes = JavaSerializationUtils.serialize(acg);
INodeManager nodeManager = ccs.getNodeManager();
for (NodeControllerState node : nodeManager.getAllNodeControllerStates()) {
- node.getNodeController().distributeJob(jobId, acgBytes);
+ node.getNodeController().deployJobSpec(deployedJobSpecId, acgBytes);
}
-
- callback.setValue(jobId);
+ callback.setValue(deployedJobSpecId);
} catch (Exception e) {
callback.setException(e);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DistributedJobFailureWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployedJobFailureWork.java
similarity index 74%
rename from hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DistributedJobFailureWork.java
rename to hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployedJobFailureWork.java
index f7fa2a4..8afdf42 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DistributedJobFailureWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DeployedJobFailureWork.java
@@ -20,20 +20,20 @@
import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksException;
-import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.control.common.work.SynchronizableWork;
-public class DistributedJobFailureWork extends SynchronizableWork {
- protected final JobId jobId;
+public class DeployedJobFailureWork extends SynchronizableWork {
+ protected final DeployedJobSpecId deployedJobSpecId;
protected final String nodeId;
- public DistributedJobFailureWork(JobId jobId, String nodeId) {
- this.jobId = jobId;
+ public DeployedJobFailureWork(DeployedJobSpecId deployedJobSpecId, String nodeId) {
+ this.deployedJobSpecId = deployedJobSpecId;
this.nodeId = nodeId;
}
@Override
public void doRun() throws HyracksException {
- throw HyracksException.create(ErrorCode.DISTRIBUTED_JOB_FAILURE, jobId, nodeId);
+ throw HyracksException.create(ErrorCode.DEPLOYED_JOB_FAILURE, deployedJobSpecId, nodeId);
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
index ed82705..cfedfc9 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/JobStartWork.java
@@ -18,9 +18,11 @@
*/
package org.apache.hyracks.control.cc.work;
-import java.util.EnumSet;
+import java.util.Map;
+import java.util.Set;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.IActivityClusterGraphGenerator;
import org.apache.hyracks.api.job.IActivityClusterGraphGeneratorFactory;
import org.apache.hyracks.api.job.JobFlag;
@@ -37,20 +39,23 @@
public class JobStartWork extends SynchronizableWork {
private final ClusterControllerService ccs;
private final byte[] acggfBytes;
- private final EnumSet<JobFlag> jobFlags;
+ private final Set<JobFlag> jobFlags;
private final DeploymentId deploymentId;
- private final JobId preDistributedJobId;
private final IResultCallback<JobId> callback;
private final JobIdFactory jobIdFactory;
+ private final DeployedJobSpecId deployedJobSpecId;
+ private final Map<byte[], byte[]> jobParameters;
public JobStartWork(ClusterControllerService ccs, DeploymentId deploymentId, byte[] acggfBytes,
- EnumSet<JobFlag> jobFlags, JobId jobId, IResultCallback<JobId> callback, JobIdFactory jobIdFactory) {
+ Set<JobFlag> jobFlags, JobIdFactory jobIdFactory, Map<byte[], byte[]> jobParameters,
+ IResultCallback<JobId> callback, DeployedJobSpecId deployedJobSpecId) {
this.deploymentId = deploymentId;
- this.preDistributedJobId = jobId;
this.ccs = ccs;
this.acggfBytes = acggfBytes;
this.jobFlags = jobFlags;
this.callback = callback;
+ this.deployedJobSpecId = deployedJobSpecId;
+ this.jobParameters = jobParameters;
this.jobIdFactory = jobIdFactory;
}
@@ -61,19 +66,18 @@
final CCServiceContext ccServiceCtx = ccs.getContext();
JobId jobId;
JobRun run;
- if (preDistributedJobId == null) {
- jobId = jobIdFactory.create();
+ jobId = jobIdFactory.create();
+ if (deployedJobSpecId == null) {
//Need to create the ActivityClusterGraph
IActivityClusterGraphGeneratorFactory acggf = (IActivityClusterGraphGeneratorFactory) DeploymentUtils
.deserialize(acggfBytes, deploymentId, ccServiceCtx);
- IActivityClusterGraphGenerator acgg =
- acggf.createActivityClusterGraphGenerator(jobId, ccServiceCtx, jobFlags);
+ IActivityClusterGraphGenerator acgg = acggf.createActivityClusterGraphGenerator(ccServiceCtx, jobFlags);
run = new JobRun(ccs, deploymentId, jobId, acggf, acgg, jobFlags);
} else {
- jobId = preDistributedJobId;
//ActivityClusterGraph has already been distributed
run = new JobRun(ccs, deploymentId, jobId, jobFlags,
- ccs.getPreDistributedJobStore().getDistributedJobDescriptor(jobId));
+ ccs.getDeployedJobSpecStore().getDeployedJobSpecDescriptor(deployedJobSpecId), jobParameters,
+ deployedJobSpecId);
}
jobManager.add(run);
callback.setValue(jobId);
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NotifyShutdownWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NotifyShutdownWork.java
index 5119022..83cbb91 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NotifyShutdownWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/NotifyShutdownWork.java
@@ -27,9 +27,9 @@
public class NotifyShutdownWork extends SynchronizableWork {
+ private static final Logger LOGGER = Logger.getLogger(NotifyShutdownWork.class.getName());
private final ClusterControllerService ccs;
private final String nodeId;
- private static Logger LOGGER = Logger.getLogger(NotifyShutdownWork.class.getName());
public NotifyShutdownWork(ClusterControllerService ccs, String nodeId) {
this.ccs = ccs;
@@ -41,8 +41,12 @@
public void doRun() {
// Triggered remotely by a NC to notify that the NC is shutting down.
ShutdownRun sRun = ccs.getShutdownRun();
- LOGGER.info("Received shutdown acknowledgement from NC ID:" + nodeId);
- sRun.notifyShutdown(nodeId);
+ if (sRun != null) {
+ LOGGER.info("Received shutdown acknowledgement from node " + nodeId);
+ sRun.notifyShutdown(nodeId);
+ } else {
+ LOGGER.info("Received unsolicted shutdown notification from node " + nodeId);
+ }
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DestroyJobWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/UndeployJobSpecWork.java
similarity index 70%
rename from hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DestroyJobWork.java
rename to hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/UndeployJobSpecWork.java
index df98252..143c8c1 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/DestroyJobWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-cc/src/main/java/org/apache/hyracks/control/cc/work/UndeployJobSpecWork.java
@@ -18,20 +18,21 @@
*/
package org.apache.hyracks.control.cc.work;
-import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.control.cc.ClusterControllerService;
import org.apache.hyracks.control.cc.NodeControllerState;
import org.apache.hyracks.control.cc.cluster.INodeManager;
import org.apache.hyracks.control.common.work.IResultCallback;
import org.apache.hyracks.control.common.work.SynchronizableWork;
-public class DestroyJobWork extends SynchronizableWork {
+public class UndeployJobSpecWork extends SynchronizableWork {
private final ClusterControllerService ccs;
- private final JobId jobId;
- private final IResultCallback<JobId> callback;
+ private final DeployedJobSpecId deployedJobSpecId;
+ private final IResultCallback<DeployedJobSpecId> callback;
- public DestroyJobWork(ClusterControllerService ccs, JobId jobId, IResultCallback<JobId> callback) {
- this.jobId = jobId;
+ public UndeployJobSpecWork(ClusterControllerService ccs, DeployedJobSpecId deployedJobSpecId,
+ IResultCallback<DeployedJobSpecId> callback) {
+ this.deployedJobSpecId = deployedJobSpecId;
this.ccs = ccs;
this.callback = callback;
}
@@ -39,12 +40,12 @@
@Override
protected void doRun() throws Exception {
try {
- ccs.getPreDistributedJobStore().removeDistributedJobDescriptor(jobId);
+ ccs.getDeployedJobSpecStore().removeDeployedJobSpecDescriptor(deployedJobSpecId);
INodeManager nodeManager = ccs.getNodeManager();
for (NodeControllerState node : nodeManager.getAllNodeControllerStates()) {
- node.getNodeController().destroyJob(jobId);
+ node.getNodeController().undeployJobSpec(deployedJobSpecId);
}
- callback.setValue(jobId);
+ callback.setValue(deployedJobSpecId);
} catch (Exception e) {
callback.setException(e);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java
index ec8e045..6fd321e 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/IClusterController.java
@@ -24,6 +24,7 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.dataset.ResultSetId;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.control.common.controllers.NodeRegistration;
import org.apache.hyracks.control.common.deployment.DeploymentStatus;
@@ -44,7 +45,7 @@
public void notifyTaskFailure(JobId jobId, TaskAttemptId taskId, String nodeId, List<Exception> exceptions)
throws Exception;
- public void notifyDistributedJobFailure(JobId jobId, String nodeId) throws Exception;
+ public void notifyDeployedJobSpecFailure(DeployedJobSpecId deployedJobSpecId, String nodeId) throws Exception;
public void notifyJobletCleanup(JobId jobId, String nodeId) throws Exception;
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java
index a10f8f0..5d781cf 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/base/INodeController.java
@@ -19,7 +19,6 @@
package org.apache.hyracks.control.common.base;
import java.net.URL;
-import java.util.EnumSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -29,6 +28,7 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.dataflow.connectors.IConnectorPolicy;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobStatus;
@@ -38,7 +38,8 @@
public interface INodeController {
public void startTasks(DeploymentId deploymentId, JobId jobId, byte[] planBytes,
List<TaskAttemptDescriptor> taskDescriptors, Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies,
- Set<JobFlag> flags) throws Exception;
+ Set<JobFlag> flags, Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId)
+ throws Exception;
public void abortTasks(JobId jobId, List<TaskAttemptId> tasks) throws Exception;
@@ -50,9 +51,9 @@
public void undeployBinary(DeploymentId deploymentId) throws Exception;
- public void distributeJob(JobId jobId, byte[] planBytes) throws Exception;
+ public void deployJobSpec(DeployedJobSpecId deployedJobSpecId, byte[] planBytes) throws Exception;
- public void destroyJob(JobId jobId) throws Exception;
+ public void undeployJobSpec(DeployedJobSpecId deployedJobSpecId) throws Exception;
public void dumpState(String stateDumpId) throws Exception;
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
index 67738ba..147e5e8 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/config/ConfigManager.java
@@ -91,6 +91,7 @@
public ConfigManager(String[] args) {
this.args = args;
+ checkJavaVersion();
for (Section section : Section.values()) {
allSections.add(section.sectionName());
}
@@ -100,6 +101,14 @@
addConfigurator(ConfiguratorMetric.APPLY_DEFAULTS, this::applyDefaults);
}
+ static void checkJavaVersion() {
+ final String javaVersion = System.getProperty("java.version");
+ LOGGER.info("Found JRE version " + javaVersion);
+ if (!javaVersion.startsWith("1.8")) {
+ throw new IllegalStateException("JRE version 1.8 is required");
+ }
+ }
+
@Override
public void addConfigurator(int metric, IConfigurator configurator) {
configurators.computeIfAbsent(metric, metric1 -> new ArrayList<>()).add(configurator);
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/CCNCFunctions.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/CCNCFunctions.java
index 4797ed7..77c352e 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/CCNCFunctions.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/CCNCFunctions.java
@@ -49,6 +49,7 @@
import org.apache.hyracks.api.dataflow.connectors.IConnectorPolicy;
import org.apache.hyracks.api.dataset.ResultSetId;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobStatus;
@@ -102,7 +103,7 @@
DISTRIBUTE_JOB,
DESTROY_JOB,
- DISTRIBUTED_JOB_FAILURE,
+ DEPLOYED_JOB_FAILURE,
STATE_DUMP_REQUEST,
STATE_DUMP_RESPONSE,
@@ -286,24 +287,24 @@
}
}
- public static class ReportDistributedJobFailureFunction extends Function {
+ public static class ReportDeployedJobSpecFailureFunction extends Function {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
private final String nodeId;
- public ReportDistributedJobFailureFunction(JobId jobId, String nodeId) {
- this.jobId = jobId;
+ public ReportDeployedJobSpecFailureFunction(DeployedJobSpecId deployedJobSpecId, String nodeId) {
+ this.deployedJobSpecId = deployedJobSpecId;
this.nodeId = nodeId;
}
@Override
public FunctionId getFunctionId() {
- return FunctionId.DISTRIBUTED_JOB_FAILURE;
+ return FunctionId.DEPLOYED_JOB_FAILURE;
}
- public JobId getJobId() {
- return jobId;
+ public DeployedJobSpecId getDeployedJobSpecId() {
+ return deployedJobSpecId;
}
public String getNodeId() {
@@ -676,15 +677,15 @@
}
}
- public static class DistributeJobFunction extends Function {
+ public static class DeployJobSpecFunction extends Function {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
private final byte[] acgBytes;
- public DistributeJobFunction(JobId jobId, byte[] acgBytes) {
- this.jobId = jobId;
+ public DeployJobSpecFunction(DeployedJobSpecId deployedJobSpecId, byte[] acgBytes) {
+ this.deployedJobSpecId = deployedJobSpecId;
this.acgBytes = acgBytes;
}
@@ -693,8 +694,8 @@
return FunctionId.DISTRIBUTE_JOB;
}
- public JobId getJobId() {
- return jobId;
+ public DeployedJobSpecId getDeployedJobSpecId() {
+ return deployedJobSpecId;
}
public byte[] getacgBytes() {
@@ -702,13 +703,13 @@
}
}
- public static class DestroyJobFunction extends Function {
+ public static class UndeployJobSpecFunction extends Function {
private static final long serialVersionUID = 1L;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
- public DestroyJobFunction(JobId jobId) {
- this.jobId = jobId;
+ public UndeployJobSpecFunction(DeployedJobSpecId deployedJobSpecId) {
+ this.deployedJobSpecId = deployedJobSpecId;
}
@Override
@@ -716,8 +717,8 @@
return FunctionId.DESTROY_JOB;
}
- public JobId getJobId() {
- return jobId;
+ public DeployedJobSpecId getDeployedJobSpecId() {
+ return deployedJobSpecId;
}
}
@@ -730,16 +731,21 @@
private final List<TaskAttemptDescriptor> taskDescriptors;
private final Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies;
private final Set<JobFlag> flags;
+ private final Map<byte[], byte[]> jobParameters;
+ private final DeployedJobSpecId deployedJobSpecId;
public StartTasksFunction(DeploymentId deploymentId, JobId jobId, byte[] planBytes,
List<TaskAttemptDescriptor> taskDescriptors,
- Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies, Set<JobFlag> flags) {
+ Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies, Set<JobFlag> flags,
+ Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId) {
this.deploymentId = deploymentId;
this.jobId = jobId;
this.planBytes = planBytes;
this.taskDescriptors = taskDescriptors;
this.connectorPolicies = connectorPolicies;
this.flags = flags;
+ this.jobParameters = jobParameters;
+ this.deployedJobSpecId = deployedJobSpecId;
}
@Override
@@ -751,10 +757,18 @@
return deploymentId;
}
+ public DeployedJobSpecId getDeployedJobSpecId() {
+ return deployedJobSpecId;
+ }
+
public JobId getJobId() {
return jobId;
}
+ public Map<byte[], byte[]> getJobParameters() {
+ return jobParameters;
+ }
+
public byte[] getPlanBytes() {
return planBytes;
}
@@ -815,7 +829,33 @@
flags.add(JobFlag.values()[(dis.readInt())]);
}
- return new StartTasksFunction(deploymentId, jobId, planBytes, taskDescriptors, connectorPolicies, flags);
+ // read job parameters
+ int paramListSize = dis.readInt();
+ Map<byte[], byte[]> jobParameters = new HashMap<>();
+ for (int i = 0; i < paramListSize; i++) {
+ int nameLength = dis.readInt();
+ byte[] nameBytes = null;
+ if (nameLength >= 0) {
+ nameBytes = new byte[nameLength];
+ dis.read(nameBytes, 0, nameLength);
+ }
+ int valueLength = dis.readInt();
+ byte[] valueBytes = null;
+ if (valueLength >= 0) {
+ valueBytes = new byte[valueLength];
+ dis.read(valueBytes, 0, valueLength);
+ }
+ jobParameters.put(nameBytes, valueBytes);
+ }
+
+ //read DeployedJobSpecId
+ DeployedJobSpecId deployedJobSpecId = null;
+ if (dis.readBoolean()) {
+ deployedJobSpecId = DeployedJobSpecId.create(dis);
+ }
+
+ return new StartTasksFunction(deploymentId, jobId, planBytes, taskDescriptors, connectorPolicies, flags,
+ jobParameters, deployedJobSpecId);
}
public static void serialize(OutputStream out, Object object) throws Exception {
@@ -853,6 +893,22 @@
for (JobFlag flag : fn.flags) {
dos.writeInt(flag.ordinal());
}
+
+ //write job parameters
+ dos.writeInt(fn.jobParameters.size());
+ for (Entry<byte[], byte[]> entry : fn.jobParameters.entrySet()) {
+ dos.writeInt(entry.getKey().length);
+ dos.write(entry.getKey(), 0, entry.getKey().length);
+ dos.writeInt(entry.getValue().length);
+ dos.write(entry.getValue(), 0, entry.getValue().length);
+ }
+
+ //write deployed job spec id
+ dos.writeBoolean(fn.getDeployedJobSpecId() == null ? false : true);
+ if (fn.getDeployedJobSpecId() != null) {
+ fn.getDeployedJobSpecId().writeFields(dos);
+ }
+
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
index c09f317..f9af4c63 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/ClusterControllerRemoteProxy.java
@@ -18,8 +18,6 @@
*/
package org.apache.hyracks.control.common.ipc;
-import static org.apache.hyracks.control.common.ipc.CCNCFunctions.*;
-
import java.net.InetSocketAddress;
import java.util.List;
import java.util.logging.Logger;
@@ -28,11 +26,30 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.dataset.ResultSetId;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.control.common.base.IClusterController;
import org.apache.hyracks.control.common.controllers.NodeRegistration;
import org.apache.hyracks.control.common.deployment.DeploymentStatus;
import org.apache.hyracks.control.common.heartbeat.HeartbeatData;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.GetNodeControllersInfoFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.NodeHeartbeatFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.NotifyDeployBinaryFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.NotifyJobletCleanupFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.NotifyTaskCompleteFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.NotifyTaskFailureFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.RegisterNodeFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.RegisterPartitionProviderFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.RegisterPartitionRequestFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.RegisterResultPartitionLocationFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ReportDeployedJobSpecFailureFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ReportProfileFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ReportResultPartitionWriteCompletionFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.SendApplicationMessageFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ShutdownResponseFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.StateDumpResponseFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ThreadDumpResponseFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.UnregisterNodeFunction;
import org.apache.hyracks.control.common.job.PartitionDescriptor;
import org.apache.hyracks.control.common.job.PartitionRequest;
import org.apache.hyracks.control.common.job.profiling.om.JobProfile;
@@ -151,9 +168,8 @@
}
@Override
- public void notifyDistributedJobFailure(JobId jobId, String nodeId) throws Exception {
- ReportDistributedJobFailureFunction fn = new ReportDistributedJobFailureFunction(
- jobId, nodeId);
+ public void notifyDeployedJobSpecFailure(DeployedJobSpecId deployedJobSpecId, String nodeId) throws Exception {
+ ReportDeployedJobSpecFailureFunction fn = new ReportDeployedJobSpecFailureFunction(deployedJobSpecId, nodeId);
ensureIpcHandle().send(-1, fn, null);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
index 3819ef8..8431eca 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-common/src/main/java/org/apache/hyracks/control/common/ipc/NodeControllerRemoteProxy.java
@@ -18,8 +18,6 @@
*/
package org.apache.hyracks.control.common.ipc;
-import static org.apache.hyracks.control.common.ipc.CCNCFunctions.*;
-
import java.net.InetSocketAddress;
import java.net.URL;
import java.util.List;
@@ -32,11 +30,24 @@
import org.apache.hyracks.api.dataflow.TaskAttemptId;
import org.apache.hyracks.api.dataflow.connectors.IConnectorPolicy;
import org.apache.hyracks.api.deployment.DeploymentId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.JobStatus;
import org.apache.hyracks.api.partitions.PartitionId;
import org.apache.hyracks.control.common.base.INodeController;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.AbortTasksFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.CleanupJobletFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.DeployBinaryFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.DeployJobSpecFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ReportPartitionAvailabilityFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.SendApplicationMessageFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ShutdownRequestFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.StartTasksFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.StateDumpRequestFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.ThreadDumpRequestFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.UnDeployBinaryFunction;
+import org.apache.hyracks.control.common.ipc.CCNCFunctions.UndeployJobSpecFunction;
import org.apache.hyracks.control.common.job.TaskAttemptDescriptor;
import org.apache.hyracks.ipc.impl.IPCSystem;
@@ -61,9 +72,10 @@
@Override
public void startTasks(DeploymentId deploymentId, JobId jobId, byte[] planBytes,
List<TaskAttemptDescriptor> taskDescriptors, Map<ConnectorDescriptorId, IConnectorPolicy> connectorPolicies,
- Set<JobFlag> flags) throws Exception {
+ Set<JobFlag> flags, Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId)
+ throws Exception {
StartTasksFunction stf = new StartTasksFunction(deploymentId, jobId, planBytes,
- taskDescriptors, connectorPolicies, flags);
+ taskDescriptors, connectorPolicies, flags, jobParameters, deployedJobSpecId);
ensureIpcHandle().send(-1, stf, null);
}
@@ -99,14 +111,14 @@
}
@Override
- public void distributeJob(JobId jobId, byte[] planBytes) throws Exception {
- DistributeJobFunction fn = new DistributeJobFunction(jobId, planBytes);
+ public void deployJobSpec(DeployedJobSpecId deployedJobSpecId, byte[] planBytes) throws Exception {
+ DeployJobSpecFunction fn = new DeployJobSpecFunction(deployedJobSpecId, planBytes);
ensureIpcHandle().send(-1, fn, null);
}
@Override
- public void destroyJob(JobId jobId) throws Exception {
- DestroyJobFunction fn = new DestroyJobFunction(jobId);
+ public void undeployJobSpec(DeployedJobSpecId deployedJobSpecId) throws Exception {
+ UndeployJobSpecFunction fn = new UndeployJobSpecFunction(deployedJobSpecId);
ensureIpcHandle().send(-1, fn, null);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Joblet.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Joblet.java
index 66a5e0f..ce666b0 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Joblet.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Joblet.java
@@ -100,8 +100,11 @@
private boolean cleanupPending;
+ private final IJobletEventListenerFactory jobletEventListenerFactory;
+
public Joblet(NodeControllerService nodeController, DeploymentId deploymentId, JobId jobId,
- INCServiceContext serviceCtx, ActivityClusterGraph acg) {
+ INCServiceContext serviceCtx, ActivityClusterGraph acg,
+ IJobletEventListenerFactory jobletEventListenerFactory) {
this.nodeController = nodeController;
this.serviceCtx = serviceCtx;
this.deploymentId = deploymentId;
@@ -117,9 +120,9 @@
deallocatableRegistry = new DefaultDeallocatableRegistry();
fileFactory = new WorkspaceFileFactory(this, serviceCtx.getIoManager());
cleanupPending = false;
- IJobletEventListenerFactory jelf = acg.getJobletEventListenerFactory();
- if (jelf != null) {
- IJobletEventListener listener = jelf.createListener(this);
+ this.jobletEventListenerFactory = jobletEventListenerFactory;
+ if (jobletEventListenerFactory != null) {
+ IJobletEventListener listener = jobletEventListenerFactory.createListener(this);
this.jobletEventListener = listener;
listener.jobletStart();
} else {
@@ -134,6 +137,11 @@
return jobId;
}
+ @Override
+ public IJobletEventListenerFactory getJobletEventListenerFactory() {
+ return jobletEventListenerFactory;
+ }
+
public ActivityClusterGraph getActivityClusterGraph() {
return acg;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerIPCI.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerIPCI.java
index 1eb1393..b220039 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerIPCI.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerIPCI.java
@@ -27,12 +27,12 @@
import org.apache.hyracks.control.nc.work.ApplicationMessageWork;
import org.apache.hyracks.control.nc.work.CleanupJobletWork;
import org.apache.hyracks.control.nc.work.DeployBinaryWork;
-import org.apache.hyracks.control.nc.work.DestroyJobWork;
-import org.apache.hyracks.control.nc.work.DistributeJobWork;
+import org.apache.hyracks.control.nc.work.DeployJobSpecWork;
import org.apache.hyracks.control.nc.work.ReportPartitionAvailabilityWork;
import org.apache.hyracks.control.nc.work.StartTasksWork;
import org.apache.hyracks.control.nc.work.StateDumpWork;
import org.apache.hyracks.control.nc.work.UnDeployBinaryWork;
+import org.apache.hyracks.control.nc.work.UndeployJobSpecWork;
import org.apache.hyracks.ipc.api.IIPCHandle;
import org.apache.hyracks.ipc.api.IIPCI;
@@ -62,8 +62,10 @@
return;
case START_TASKS:
CCNCFunctions.StartTasksFunction stf = (CCNCFunctions.StartTasksFunction) fn;
- ncs.getWorkQueue().schedule(new StartTasksWork(ncs, stf.getDeploymentId(), stf.getJobId(),
- stf.getPlanBytes(), stf.getTaskDescriptors(), stf.getConnectorPolicies(), stf.getFlags()));
+ ncs.getWorkQueue()
+ .schedule(new StartTasksWork(ncs, stf.getDeploymentId(), stf.getJobId(), stf.getPlanBytes(),
+ stf.getTaskDescriptors(), stf.getConnectorPolicies(), stf.getFlags(),
+ stf.getJobParameters(), stf.getDeployedJobSpecId()));
return;
case ABORT_TASKS:
CCNCFunctions.AbortTasksFunction atf = (CCNCFunctions.AbortTasksFunction) fn;
@@ -104,13 +106,13 @@
return;
case DISTRIBUTE_JOB:
- CCNCFunctions.DistributeJobFunction djf = (CCNCFunctions.DistributeJobFunction) fn;
- ncs.getWorkQueue().schedule(new DistributeJobWork(ncs, djf.getJobId(), djf.getacgBytes()));
+ CCNCFunctions.DeployJobSpecFunction djf = (CCNCFunctions.DeployJobSpecFunction) fn;
+ ncs.getWorkQueue().schedule(new DeployJobSpecWork(ncs, djf.getDeployedJobSpecId(), djf.getacgBytes()));
return;
case DESTROY_JOB:
- CCNCFunctions.DestroyJobFunction dsjf = (CCNCFunctions.DestroyJobFunction) fn;
- ncs.getWorkQueue().schedule(new DestroyJobWork(ncs, dsjf.getJobId()));
+ CCNCFunctions.UndeployJobSpecFunction dsjf = (CCNCFunctions.UndeployJobSpecFunction) fn;
+ ncs.getWorkQueue().schedule(new UndeployJobSpecWork(ncs, dsjf.getDeployedJobSpecId()));
return;
case STATE_DUMP_REQUEST:
@@ -120,7 +122,7 @@
case SHUTDOWN_REQUEST:
final CCNCFunctions.ShutdownRequestFunction sdrf = (CCNCFunctions.ShutdownRequestFunction) fn;
- ncs.getExecutor().submit(new ShutdownTask(ncs, sdrf.isTerminateNCService()));
+ ncs.getExecutor().submit(new ShutdownTask(sdrf.isTerminateNCService()));
return;
case THREAD_DUMP_REQUEST:
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
index 7a01b87..a3a9ac5 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/NodeControllerService.java
@@ -29,6 +29,7 @@
import java.lang.management.ThreadMXBean;
import java.net.InetSocketAddress;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.List;
import java.util.Map;
@@ -53,7 +54,9 @@
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.io.IODeviceHandle;
import org.apache.hyracks.api.job.ActivityClusterGraph;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.JobParameterByteStore;
import org.apache.hyracks.api.lifecycle.ILifeCycleComponentManager;
import org.apache.hyracks.api.lifecycle.LifeCycleComponentManager;
import org.apache.hyracks.api.service.IControllerService;
@@ -128,7 +131,9 @@
private final Map<JobId, Joblet> jobletMap;
- private final Map<JobId, ActivityClusterGraph> preDistributedJobs;
+ private final Map<Long, ActivityClusterGraph> deployedJobSpecActivityClusterGraphMap;
+
+ private final Map<JobId, JobParameterByteStore> jobParameterByteStoreMap = new HashMap<>();
private ExecutorService executor;
@@ -202,7 +207,7 @@
workQueue = new WorkQueue(id, Thread.NORM_PRIORITY); // Reserves MAX_PRIORITY of the heartbeat thread.
jobletMap = new Hashtable<>();
- preDistributedJobs = new Hashtable<>();
+ deployedJobSpecActivityClusterGraphMap = new Hashtable<>();
timer = new Timer(true);
serverCtx = new ServerContext(ServerContext.ServerType.NODE_CONTROLLER,
new File(new File(NodeControllerService.class.getName()), id));
@@ -404,6 +409,13 @@
heartbeatThread.interrupt();
heartbeatThread.join(1000); // give it 1s to stop gracefully
}
+ try {
+ ccs.notifyShutdown(id);
+ } catch (Exception e) {
+ LOGGER.log(Level.WARNING, "Exception notifying CC of shutdown", e);
+ }
+ ipc.stop();
+
LOGGER.log(Level.INFO, "Stopped NodeControllerService");
} else {
LOGGER.log(Level.SEVERE, "Duplicate shutdown call; original: " + Arrays.toString(shutdownCallStack),
@@ -423,28 +435,43 @@
return jobletMap;
}
- public void storeActivityClusterGraph(JobId jobId, ActivityClusterGraph acg) throws HyracksException {
- if (preDistributedJobs.get(jobId) != null) {
- throw HyracksException.create(ErrorCode.DUPLICATE_DISTRIBUTED_JOB, jobId);
- }
- preDistributedJobs.put(jobId, acg);
+ public void removeJobParameterByteStore(JobId jobId) {
+ jobParameterByteStoreMap.remove(jobId);
}
- public void removeActivityClusterGraph(JobId jobId) throws HyracksException {
- if (preDistributedJobs.get(jobId) == null) {
- throw HyracksException.create(ErrorCode.ERROR_FINDING_DISTRIBUTED_JOB, jobId);
+ public JobParameterByteStore createOrGetJobParameterByteStore(JobId jobId) throws HyracksException {
+ JobParameterByteStore jpbs = jobParameterByteStoreMap.get(jobId);
+ if (jpbs == null) {
+ jpbs = new JobParameterByteStore();
+ jobParameterByteStoreMap.put(jobId, jpbs);
}
- preDistributedJobs.remove(jobId);
+ return jpbs;
}
- public void checkForDuplicateDistributedJob(JobId jobId) throws HyracksException {
- if (preDistributedJobs.get(jobId) != null) {
- throw HyracksException.create(ErrorCode.DUPLICATE_DISTRIBUTED_JOB, jobId);
+
+ public void storeActivityClusterGraph(DeployedJobSpecId deployedJobSpecId, ActivityClusterGraph acg)
+ throws HyracksException {
+ if (deployedJobSpecActivityClusterGraphMap.get(deployedJobSpecId.getId()) != null) {
+ throw HyracksException.create(ErrorCode.DUPLICATE_DEPLOYED_JOB, deployedJobSpecId);
+ }
+ deployedJobSpecActivityClusterGraphMap.put(deployedJobSpecId.getId(), acg);
+ }
+
+ public void removeActivityClusterGraph(DeployedJobSpecId deployedJobSpecId) throws HyracksException {
+ if (deployedJobSpecActivityClusterGraphMap.get(deployedJobSpecId.getId()) == null) {
+ throw HyracksException.create(ErrorCode.ERROR_FINDING_DEPLOYED_JOB, deployedJobSpecId);
+ }
+ deployedJobSpecActivityClusterGraphMap.remove(deployedJobSpecId.getId());
+ }
+
+ public void checkForDuplicateDeployedJobSpec(DeployedJobSpecId deployedJobSpecId) throws HyracksException {
+ if (deployedJobSpecActivityClusterGraphMap.get(deployedJobSpecId.getId()) != null) {
+ throw HyracksException.create(ErrorCode.DUPLICATE_DEPLOYED_JOB, deployedJobSpecId);
}
}
- public ActivityClusterGraph getActivityClusterGraph(JobId jobId) throws HyracksException {
- return preDistributedJobs.get(jobId);
+ public ActivityClusterGraph getActivityClusterGraph(DeployedJobSpecId deployedJobSpecId) throws HyracksException {
+ return deployedJobSpecActivityClusterGraphMap.get(deployedJobSpecId.getId());
}
public NetworkManager getNetworkManager() {
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
index fcd4bde..94ee92b 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/Task.java
@@ -455,6 +455,9 @@
}
@Override
+ public byte[] getJobParameter(byte[] name, int start, int length) throws HyracksException {
+ return ncs.createOrGetJobParameterByteStore(joblet.getJobId()).getParameterValue(name, start, length);
+ }
public Set<JobFlag> getJobFlags() {
return jobFlags;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
index 5506a94..3582da2 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/partitions/MaterializingPipelinedPartition.java
@@ -38,31 +38,19 @@
private static final Logger LOGGER = Logger.getLogger(MaterializingPipelinedPartition.class.getName());
private final IHyracksTaskContext ctx;
-
private final Executor executor;
-
private final IIOManager ioManager;
-
private final PartitionManager manager;
-
private final PartitionId pid;
-
private final TaskAttemptId taId;
-
private FileReference fRef;
-
private IFileHandle writeHandle;
-
private long size;
-
private boolean eos;
-
private boolean failed;
-
protected boolean flushRequest;
-
+ private boolean deallocated;
private Level openCloseLevel = Level.FINE;
-
private Thread dataConsumerThread;
public MaterializingPipelinedPartition(IHyracksTaskContext ctx, PartitionManager manager, PartitionId pid,
@@ -89,6 +77,7 @@
if (dataConsumerThread != null) {
dataConsumerThread.interrupt();
}
+ deallocated = true;
}
@Override
@@ -109,14 +98,19 @@
fRefCopy = fRef;
}
writer.open();
- IFileHandle readHandle = fRefCopy == null ? null
- : ioManager.open(fRefCopy, IIOManager.FileReadWriteMode.READ_ONLY,
- IIOManager.FileSyncMode.METADATA_ASYNC_DATA_ASYNC);
+ IFileHandle readHandle = fRefCopy == null ? null :
+ ioManager.open(fRefCopy, IIOManager.FileReadWriteMode.READ_ONLY,
+ IIOManager.FileSyncMode.METADATA_ASYNC_DATA_ASYNC);
try {
if (readHandle == null) {
// Either fail() is called or close() is called with 0 tuples coming in.
return;
}
+ synchronized (MaterializingPipelinedPartition.this) {
+ if (deallocated) {
+ return;
+ }
+ }
long offset = 0;
ByteBuffer buffer = ctx.allocateFrame();
boolean done = false;
@@ -192,6 +186,7 @@
size = 0;
eos = false;
failed = false;
+ deallocated = false;
manager.registerPartition(pid, taId, this, PartitionState.STARTED, false);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/task/ShutdownTask.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/task/ShutdownTask.java
index e9cf3cb..4dd57f2 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/task/ShutdownTask.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/task/ShutdownTask.java
@@ -19,34 +19,17 @@
package org.apache.hyracks.control.nc.task;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.hyracks.control.common.base.IClusterController;
-import org.apache.hyracks.control.nc.NodeControllerService;
import org.apache.hyracks.util.ExitUtil;
public class ShutdownTask implements Runnable {
- private static final Logger LOGGER = Logger.getLogger(ShutdownTask.class.getName());
- private final NodeControllerService ncs;
private final boolean terminateNCService;
- public ShutdownTask(NodeControllerService ncs, boolean terminateNCService) {
- this.ncs = ncs;
+ public ShutdownTask(boolean terminateNCService) {
this.terminateNCService = terminateNCService;
}
@Override
- @SuppressWarnings("squid:S1147") // Runtime.exit()
public void run() {
- IClusterController ccs = ncs.getClusterController();
- try {
- ccs.notifyShutdown(ncs.getId());
- } catch (Exception e) {
- LOGGER.log(Level.WARNING, "Exception notifying CC of shutdown acknowledgment", e);
- // proceed with shutdown
- }
-
ExitUtil.exit(terminateNCService ? 99 : 0);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
index 670ce06..03ae90c 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/CleanupJobletWork.java
@@ -51,6 +51,7 @@
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Cleaning up after job: " + jobId);
}
+ ncs.removeJobParameterByteStore(jobId);
final List<IPartition> unregisteredPartitions = new ArrayList<IPartition>();
ncs.getPartitionManager().unregisterPartitions(jobId, unregisteredPartitions);
ncs.getExecutor().execute(new Runnable() {
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DistributeJobWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployJobSpecWork.java
similarity index 75%
rename from hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DistributeJobWork.java
rename to hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployJobSpecWork.java
index 486a420..4276b67 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DistributeJobWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DeployJobSpecWork.java
@@ -21,7 +21,7 @@
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.job.ActivityClusterGraph;
-import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.control.common.deployment.DeploymentUtils;
import org.apache.hyracks.control.common.work.AbstractWork;
import org.apache.hyracks.control.nc.NodeControllerService;
@@ -30,29 +30,28 @@
* pre-distribute a job that can be executed later
*
*/
-public class DistributeJobWork extends AbstractWork {
+public class DeployJobSpecWork extends AbstractWork {
private final NodeControllerService ncs;
private final byte[] acgBytes;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
- public DistributeJobWork(NodeControllerService ncs, JobId jobId, byte[] acgBytes) {
+ public DeployJobSpecWork(NodeControllerService ncs, DeployedJobSpecId deployedJobSpecId, byte[] acgBytes) {
this.ncs = ncs;
- this.jobId = jobId;
+ this.deployedJobSpecId = deployedJobSpecId;
this.acgBytes = acgBytes;
}
@Override
public void run() {
try {
- ncs.checkForDuplicateDistributedJob(jobId);
- ncs.updateMaxJobId(jobId);
+ ncs.checkForDuplicateDeployedJobSpec(deployedJobSpecId);
ActivityClusterGraph acg =
(ActivityClusterGraph) DeploymentUtils.deserialize(acgBytes, null, ncs.getContext());
- ncs.storeActivityClusterGraph(jobId, acg);
+ ncs.storeActivityClusterGraph(deployedJobSpecId, acg);
} catch (HyracksException e) {
try {
- ncs.getClusterController().notifyDistributedJobFailure(jobId, ncs.getId());
+ ncs.getClusterController().notifyDeployedJobSpecFailure(deployedJobSpecId, ncs.getId());
} catch (Exception e1) {
e1.printStackTrace();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/StartTasksWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/StartTasksWork.java
index c369781..a2fcc25 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/StartTasksWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/StartTasksWork.java
@@ -47,11 +47,12 @@
import org.apache.hyracks.api.dataflow.value.IRecordDescriptorProvider;
import org.apache.hyracks.api.dataflow.value.RecordDescriptor;
import org.apache.hyracks.api.deployment.DeploymentId;
-import org.apache.hyracks.api.exceptions.ErrorCode;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.job.ActivityCluster;
import org.apache.hyracks.api.job.ActivityClusterGraph;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.api.job.JobFlag;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.partitions.PartitionId;
@@ -79,6 +80,8 @@
private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
+
private final byte[] acgBytes;
private final List<TaskAttemptDescriptor> taskDescriptors;
@@ -87,16 +90,21 @@
private final Set<JobFlag> flags;
+ private final Map<byte[], byte[]> jobParameters;
+
public StartTasksWork(NodeControllerService ncs, DeploymentId deploymentId, JobId jobId, byte[] acgBytes,
List<TaskAttemptDescriptor> taskDescriptors,
- Map<ConnectorDescriptorId, IConnectorPolicy> connectorPoliciesMap, Set<JobFlag> flags) {
+ Map<ConnectorDescriptorId, IConnectorPolicy> connectorPoliciesMap, Set<JobFlag> flags,
+ Map<byte[], byte[]> jobParameters, DeployedJobSpecId deployedJobSpecId) {
this.ncs = ncs;
this.deploymentId = deploymentId;
this.jobId = jobId;
+ this.deployedJobSpecId = deployedJobSpecId;
this.acgBytes = acgBytes;
this.taskDescriptors = taskDescriptors;
this.connectorPoliciesMap = connectorPoliciesMap;
this.flags = flags;
+ this.jobParameters = jobParameters;
}
@Override
@@ -106,7 +114,7 @@
try {
ncs.updateMaxJobId(jobId);
NCServiceContext serviceCtx = ncs.getContext();
- Joblet joblet = getOrCreateLocalJoblet(deploymentId, jobId, serviceCtx, acgBytes);
+ Joblet joblet = getOrCreateLocalJoblet(deploymentId, serviceCtx, acgBytes);
final ActivityClusterGraph acg = joblet.getActivityClusterGraph();
IRecordDescriptorProvider rdp = new IRecordDescriptorProvider() {
@Override
@@ -190,19 +198,22 @@
}
}
- private Joblet getOrCreateLocalJoblet(DeploymentId deploymentId, JobId jobId, INCServiceContext appCtx,
- byte[] acgBytes) throws HyracksException {
+ private Joblet getOrCreateLocalJoblet(DeploymentId deploymentId, INCServiceContext appCtx, byte[] acgBytes)
+ throws HyracksException {
Map<JobId, Joblet> jobletMap = ncs.getJobletMap();
Joblet ji = jobletMap.get(jobId);
if (ji == null) {
- ActivityClusterGraph acg = ncs.getActivityClusterGraph(jobId);
- if (acg == null) {
- if (acgBytes == null) {
- throw HyracksException.create(ErrorCode.ERROR_FINDING_DISTRIBUTED_JOB, jobId);
+ ActivityClusterGraph acg = (deployedJobSpecId != null) ? ncs.getActivityClusterGraph(deployedJobSpecId)
+ : (ActivityClusterGraph) DeploymentUtils.deserialize(acgBytes, deploymentId, appCtx);
+ ncs.createOrGetJobParameterByteStore(jobId).setParameters(jobParameters);
+ IJobletEventListenerFactory listenerFactory = acg.getJobletEventListenerFactory();
+ if (listenerFactory != null) {
+ if (deployedJobSpecId != null) {
+ listenerFactory = acg.getJobletEventListenerFactory().copyFactory();
}
- acg = (ActivityClusterGraph) DeploymentUtils.deserialize(acgBytes, deploymentId, appCtx);
+ listenerFactory.updateListenerJobParameters(ncs.createOrGetJobParameterByteStore(jobId));
}
- ji = new Joblet(ncs, deploymentId, jobId, appCtx, acg);
+ ji = new Joblet(ncs, deploymentId, jobId, appCtx, acg, listenerFactory);
jobletMap.put(jobId, ji);
}
return ji;
diff --git a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DestroyJobWork.java b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/UndeployJobSpecWork.java
similarity index 72%
rename from hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DestroyJobWork.java
rename to hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/UndeployJobSpecWork.java
index 55dd01e..4383ff6 100644
--- a/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/DestroyJobWork.java
+++ b/hyracks-fullstack/hyracks/hyracks-control/hyracks-control-nc/src/main/java/org/apache/hyracks/control/nc/work/UndeployJobSpecWork.java
@@ -20,31 +20,31 @@
package org.apache.hyracks.control.nc.work;
import org.apache.hyracks.api.exceptions.HyracksException;
-import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
import org.apache.hyracks.control.common.work.AbstractWork;
import org.apache.hyracks.control.nc.NodeControllerService;
/**
- * destroy a pre-distributed job
+ * remove the deployed job
*
*/
-public class DestroyJobWork extends AbstractWork {
+public class UndeployJobSpecWork extends AbstractWork {
private final NodeControllerService ncs;
- private final JobId jobId;
+ private final DeployedJobSpecId deployedJobSpecId;
- public DestroyJobWork(NodeControllerService ncs, JobId jobId) {
+ public UndeployJobSpecWork(NodeControllerService ncs, DeployedJobSpecId deployedJobSpecId) {
this.ncs = ncs;
- this.jobId = jobId;
+ this.deployedJobSpecId = deployedJobSpecId;
}
@Override
public void run() {
try {
- ncs.removeActivityClusterGraph(jobId);
+ ncs.removeActivityClusterGraph(deployedJobSpecId);
} catch (HyracksException e) {
try {
- ncs.getClusterController().notifyDistributedJobFailure(jobId, ncs.getId());
+ ncs.getClusterController().notifyDeployedJobSpecFailure(deployedJobSpecId, ncs.getId());
} catch (Exception e1) {
e1.printStackTrace();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java
new file mode 100644
index 0000000..dd4fdd1
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/DeployedJobSpecsTest.java
@@ -0,0 +1,206 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.tests.integration;
+
+import static org.apache.hyracks.util.file.FileUtil.joinPath;
+import static org.mockito.Matchers.any;
+import static org.mockito.Mockito.verify;
+
+import java.io.File;
+import java.lang.reflect.Field;
+import java.util.HashMap;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.hyracks.api.client.HyracksConnection;
+import org.apache.hyracks.api.client.IHyracksClientConnection;
+import org.apache.hyracks.api.job.DeployedJobSpecId;
+import org.apache.hyracks.api.job.JobId;
+import org.apache.hyracks.api.job.JobSpecification;
+import org.apache.hyracks.control.cc.ClusterControllerService;
+import org.apache.hyracks.control.cc.cluster.INodeManager;
+import org.apache.hyracks.control.cc.cluster.NodeManager;
+import org.apache.hyracks.control.common.controllers.CCConfig;
+import org.apache.hyracks.control.common.controllers.NCConfig;
+import org.apache.hyracks.control.nc.NodeControllerService;
+import org.junit.AfterClass;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.mockito.Mockito;
+
+public class DeployedJobSpecsTest {
+ private static final Logger LOGGER = Logger.getLogger(DeployedJobSpecsTest.class.getName());
+
+ private static final String NC1_ID = "nc1";
+ private static final String NC2_ID = "nc2";
+ private static final int TIME_THRESHOLD = 5000;
+
+ private static ClusterControllerService cc;
+ private static NodeControllerService nc1;
+ private static NodeControllerService nc2;
+ private static IHyracksClientConnection hcc;
+
+ @BeforeClass
+ public static void init() throws Exception {
+ CCConfig ccConfig = new CCConfig();
+ ccConfig.setClientListenAddress("127.0.0.1");
+ ccConfig.setClientListenPort(39000);
+ ccConfig.setClusterListenAddress("127.0.0.1");
+ ccConfig.setClusterListenPort(39001);
+ ccConfig.setProfileDumpPeriod(10000);
+ FileUtils.deleteQuietly(new File(joinPath("target", "data")));
+ FileUtils.copyDirectory(new File("data"), new File(joinPath("target", "data")));
+ File outDir = new File("target" + File.separator + "ClusterController");
+ outDir.mkdirs();
+ File ccRoot = File.createTempFile(AbstractIntegrationTest.class.getName(), ".data", outDir);
+ ccRoot.delete();
+ ccRoot.mkdir();
+ ccConfig.setRootDir(ccRoot.getAbsolutePath());
+ ClusterControllerService ccBase = new ClusterControllerService(ccConfig);
+ // The spying below is dangerous since it replaces the ClusterControllerService already referenced by many
+ // objects created in the constructor above
+ cc = Mockito.spy(ccBase);
+ cc.start();
+
+ // The following code partially fixes the problem created by the spying
+ INodeManager nodeManager = cc.getNodeManager();
+ Field ccsInNodeManager = NodeManager.class.getDeclaredField("ccs");
+ ccsInNodeManager.setAccessible(true);
+ ccsInNodeManager.set(nodeManager, cc);
+
+ NCConfig ncConfig1 = new NCConfig(NC1_ID);
+ ncConfig1.setClusterAddress("localhost");
+ ncConfig1.setClusterPort(39001);
+ ncConfig1.setClusterListenAddress("127.0.0.1");
+ ncConfig1.setDataListenAddress("127.0.0.1");
+ ncConfig1.setResultListenAddress("127.0.0.1");
+ ncConfig1.setResultSweepThreshold(TIME_THRESHOLD);
+ ncConfig1.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device0") });
+ NodeControllerService nc1Base = new NodeControllerService(ncConfig1);
+ nc1 = Mockito.spy(nc1Base);
+ nc1.start();
+
+ NCConfig ncConfig2 = new NCConfig(NC2_ID);
+ ncConfig2.setClusterAddress("localhost");
+ ncConfig2.setClusterPort(39001);
+ ncConfig2.setClusterListenAddress("127.0.0.1");
+ ncConfig2.setDataListenAddress("127.0.0.1");
+ ncConfig2.setResultListenAddress("127.0.0.1");
+ ncConfig2.setResultSweepThreshold(TIME_THRESHOLD);
+ ncConfig2.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device1") });
+ NodeControllerService nc2Base = new NodeControllerService(ncConfig2);
+ nc2 = Mockito.spy(nc2Base);
+ nc2.start();
+
+ hcc = new HyracksConnection(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort());
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.info("Starting CC in " + ccRoot.getAbsolutePath());
+ }
+ }
+
+ @Test
+ public void DistributedTest() throws Exception {
+ JobSpecification spec1 = UnionTest.createUnionJobSpec();
+ JobSpecification spec2 = HeapSortMergeTest.createSortMergeJobSpec();
+
+ //distribute both jobs
+ DeployedJobSpecId distributedId1 = hcc.deployJobSpec(spec1);
+ DeployedJobSpecId distributedId2 = hcc.deployJobSpec(spec2);
+
+ //make sure it finished
+ //cc will get the store once to check for duplicate insertion and once to insert per job
+ verify(cc, Mockito.timeout(TIME_THRESHOLD).times(4)).getDeployedJobSpecStore();
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(2)).storeActivityClusterGraph(any(), any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(2)).storeActivityClusterGraph(any(), any());
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(2)).checkForDuplicateDeployedJobSpec(any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(2)).checkForDuplicateDeployedJobSpec(any());
+
+ //confirm that both jobs are distributed
+ Assert.assertTrue(nc1.getActivityClusterGraph(distributedId1) != null && nc2.getActivityClusterGraph(distributedId1) != null);
+ Assert.assertTrue(nc1.getActivityClusterGraph(distributedId2) != null && nc2.getActivityClusterGraph(distributedId2) != null);
+ Assert.assertTrue(cc.getDeployedJobSpecStore().getDeployedJobSpecDescriptor(distributedId1) != null);
+ Assert.assertTrue(cc.getDeployedJobSpecStore().getDeployedJobSpecDescriptor(distributedId2) != null);
+
+ //run the first job
+ JobId jobRunId1 = hcc.startJob(distributedId1, new HashMap<>());
+ hcc.waitForCompletion(jobRunId1);
+
+ //Make sure the job parameter map was removed
+ verify(cc, Mockito.timeout(TIME_THRESHOLD).times(1)).removeJobParameterByteStore(any());
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(1)).removeJobParameterByteStore(any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(1)).removeJobParameterByteStore(any());
+
+ //destroy the first job
+ hcc.undeployJobSpec(distributedId1);
+
+ //make sure it finished
+ verify(cc, Mockito.timeout(TIME_THRESHOLD).times(8)).getDeployedJobSpecStore();
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(1)).removeActivityClusterGraph(any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(1)).removeActivityClusterGraph(any());
+
+ //confirm the first job is destroyed
+ Assert.assertTrue(nc1.getActivityClusterGraph(distributedId1) == null && nc2.getActivityClusterGraph(distributedId1) == null);
+ cc.getDeployedJobSpecStore().checkForExistingDeployedJobSpecDescriptor(distributedId1);
+
+ //run the second job
+ JobId jobRunId2 = hcc.startJob(distributedId2, new HashMap<>());
+ hcc.waitForCompletion(jobRunId2);
+
+ //Make sure the job parameter map was removed
+ verify(cc, Mockito.timeout(TIME_THRESHOLD).times(2)).removeJobParameterByteStore(any());
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(2)).removeJobParameterByteStore(any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(2)).removeJobParameterByteStore(any());
+
+ //run the second job again
+ JobId jobRunId3 = hcc.startJob(distributedId2, new HashMap<>());
+ hcc.waitForCompletion(jobRunId3);
+
+ //Make sure the job parameter map was removed
+ verify(cc, Mockito.timeout(TIME_THRESHOLD).times(3)).removeJobParameterByteStore(any());
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(3)).removeJobParameterByteStore(any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(3)).removeJobParameterByteStore(any());
+
+ //destroy the second job
+ hcc.undeployJobSpec(distributedId2);
+
+ //make sure it finished
+ verify(cc, Mockito.timeout(TIME_THRESHOLD).times(12)).getDeployedJobSpecStore();
+ verify(nc1, Mockito.timeout(TIME_THRESHOLD).times(2)).removeActivityClusterGraph(any());
+ verify(nc2, Mockito.timeout(TIME_THRESHOLD).times(2)).removeActivityClusterGraph(any());
+
+ //confirm the second job is destroyed
+ Assert.assertTrue(nc1.getActivityClusterGraph(distributedId2) == null && nc2.getActivityClusterGraph(distributedId2) == null);
+ cc.getDeployedJobSpecStore().checkForExistingDeployedJobSpecDescriptor(distributedId2);
+
+ //run the second job 100 times in parallel
+ distributedId2 = hcc.deployJobSpec(spec2);
+ for (int i = 0; i < 100; i++) {
+ hcc.startJob(distributedId2, new HashMap<>());
+ }
+ }
+
+ @AfterClass
+ public static void deinit() throws Exception {
+ nc2.stop();
+ nc1.stop();
+ cc.stop();
+ }
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/PredistributedJobsTest.java b/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/PredistributedJobsTest.java
deleted file mode 100644
index caba5f6..0000000
--- a/hyracks-fullstack/hyracks/hyracks-examples/hyracks-integration-tests/src/test/java/org/apache/hyracks/tests/integration/PredistributedJobsTest.java
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hyracks.tests.integration;
-
-import static org.apache.hyracks.util.file.FileUtil.joinPath;
-import static org.mockito.Matchers.any;
-import static org.mockito.Mockito.verify;
-
-import java.io.File;
-import java.lang.reflect.Field;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.apache.commons.io.FileUtils;
-import org.apache.hyracks.api.client.HyracksConnection;
-import org.apache.hyracks.api.client.IHyracksClientConnection;
-import org.apache.hyracks.api.job.JobId;
-import org.apache.hyracks.api.job.JobSpecification;
-import org.apache.hyracks.control.cc.ClusterControllerService;
-import org.apache.hyracks.control.cc.cluster.INodeManager;
-import org.apache.hyracks.control.cc.cluster.NodeManager;
-import org.apache.hyracks.control.common.controllers.CCConfig;
-import org.apache.hyracks.control.common.controllers.NCConfig;
-import org.apache.hyracks.control.nc.NodeControllerService;
-import org.junit.AfterClass;
-import org.junit.Assert;
-import org.junit.BeforeClass;
-import org.junit.Test;
-import org.mockito.Mockito;
-
-public class PredistributedJobsTest {
- private static final Logger LOGGER = Logger.getLogger(PredistributedJobsTest.class.getName());
-
- private static final String NC1_ID = "nc1";
- private static final String NC2_ID = "nc2";
-
- private static ClusterControllerService cc;
- private static NodeControllerService nc1;
- private static NodeControllerService nc2;
- private static IHyracksClientConnection hcc;
-
- @BeforeClass
- public static void init() throws Exception {
- CCConfig ccConfig = new CCConfig();
- ccConfig.setClientListenAddress("127.0.0.1");
- ccConfig.setClientListenPort(39000);
- ccConfig.setClusterListenAddress("127.0.0.1");
- ccConfig.setClusterListenPort(39001);
- ccConfig.setProfileDumpPeriod(10000);
- FileUtils.deleteQuietly(new File(joinPath("target", "data")));
- FileUtils.copyDirectory(new File("data"), new File(joinPath("target", "data")));
- File outDir = new File("target" + File.separator + "ClusterController");
- outDir.mkdirs();
- File ccRoot = File.createTempFile(AbstractIntegrationTest.class.getName(), ".data", outDir);
- ccRoot.delete();
- ccRoot.mkdir();
- ccConfig.setRootDir(ccRoot.getAbsolutePath());
- ClusterControllerService ccBase = new ClusterControllerService(ccConfig);
- // The spying below is dangerous since it replaces the ClusterControllerService already referenced by many
- // objects created in the constructor above
- cc = Mockito.spy(ccBase);
- cc.start();
-
- // The following code partially fixes the problem created by the spying
- INodeManager nodeManager = cc.getNodeManager();
- Field ccsInNodeManager = NodeManager.class.getDeclaredField("ccs");
- ccsInNodeManager.setAccessible(true);
- ccsInNodeManager.set(nodeManager, cc);
-
- NCConfig ncConfig1 = new NCConfig(NC1_ID);
- ncConfig1.setClusterAddress("localhost");
- ncConfig1.setClusterPort(39001);
- ncConfig1.setClusterListenAddress("127.0.0.1");
- ncConfig1.setDataListenAddress("127.0.0.1");
- ncConfig1.setResultListenAddress("127.0.0.1");
- ncConfig1.setResultSweepThreshold(5000);
- ncConfig1.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device0") });
- NodeControllerService nc1Base = new NodeControllerService(ncConfig1);
- nc1 = Mockito.spy(nc1Base);
- nc1.start();
-
- NCConfig ncConfig2 = new NCConfig(NC2_ID);
- ncConfig2.setClusterAddress("localhost");
- ncConfig2.setClusterPort(39001);
- ncConfig2.setClusterListenAddress("127.0.0.1");
- ncConfig2.setDataListenAddress("127.0.0.1");
- ncConfig2.setResultListenAddress("127.0.0.1");
- ncConfig2.setResultSweepThreshold(5000);
- ncConfig2.setIODevices(new String[] { joinPath(System.getProperty("user.dir"), "target", "data", "device1") });
- NodeControllerService nc2Base = new NodeControllerService(ncConfig2);
- nc2 = Mockito.spy(nc2Base);
- nc2.start();
-
- hcc = new HyracksConnection(ccConfig.getClientListenAddress(), ccConfig.getClientListenPort());
- if (LOGGER.isLoggable(Level.INFO)) {
- LOGGER.info("Starting CC in " + ccRoot.getAbsolutePath());
- }
- }
-
- @Test
- public void DistributedTest() throws Exception {
- JobSpecification spec1 = UnionTest.createUnionJobSpec();
- JobSpecification spec2 = HeapSortMergeTest.createSortMergeJobSpec();
-
- //distribute both jobs
- JobId jobId1 = hcc.distributeJob(spec1);
- JobId jobId2 = hcc.distributeJob(spec2);
-
- //make sure it finished
- //cc will get the store once to check for duplicate insertion and once to insert per job
- verify(cc, Mockito.timeout(5000).times(4)).getPreDistributedJobStore();
- verify(nc1, Mockito.timeout(5000).times(2)).storeActivityClusterGraph(any(), any());
- verify(nc2, Mockito.timeout(5000).times(2)).storeActivityClusterGraph(any(), any());
- verify(nc1, Mockito.timeout(5000).times(2)).checkForDuplicateDistributedJob(any());
- verify(nc2, Mockito.timeout(5000).times(2)).checkForDuplicateDistributedJob(any());
-
- //confirm that both jobs are distributed
- Assert.assertTrue(nc1.getActivityClusterGraph(jobId1) != null && nc2.getActivityClusterGraph(jobId1) != null);
- Assert.assertTrue(nc1.getActivityClusterGraph(jobId2) != null && nc2.getActivityClusterGraph(jobId2) != null);
- Assert.assertTrue(cc.getPreDistributedJobStore().getDistributedJobDescriptor(jobId1) != null);
- Assert.assertTrue(cc.getPreDistributedJobStore().getDistributedJobDescriptor(jobId2) != null);
-
- //run the first job
- hcc.startJob(jobId1);
- hcc.waitForCompletion(jobId1);
-
- //destroy the first job
- hcc.destroyJob(jobId1);
-
- //make sure it finished
- verify(cc, Mockito.timeout(5000).times(8)).getPreDistributedJobStore();
- verify(nc1, Mockito.timeout(5000).times(1)).removeActivityClusterGraph(any());
- verify(nc2, Mockito.timeout(5000).times(1)).removeActivityClusterGraph(any());
-
- //confirm the first job is destroyed
- Assert.assertTrue(nc1.getActivityClusterGraph(jobId1) == null && nc2.getActivityClusterGraph(jobId1) == null);
- cc.getPreDistributedJobStore().checkForExistingDistributedJobDescriptor(jobId1);
-
- //run the second job
- hcc.startJob(jobId2);
- hcc.waitForCompletion(jobId2);
-
- //wait ten seconds to ensure the result sweeper does not break the job
- //The result sweeper runs every 5 seconds during the tests
- Thread.sleep(10000);
-
- //run the second job again
- hcc.startJob(jobId2);
- hcc.waitForCompletion(jobId2);
-
- //destroy the second job
- hcc.destroyJob(jobId2);
-
- //make sure it finished
- verify(cc, Mockito.timeout(5000).times(12)).getPreDistributedJobStore();
- verify(nc1, Mockito.timeout(5000).times(2)).removeActivityClusterGraph(any());
- verify(nc2, Mockito.timeout(5000).times(2)).removeActivityClusterGraph(any());
-
- //confirm the second job is destroyed
- Assert.assertTrue(nc1.getActivityClusterGraph(jobId2) == null && nc2.getActivityClusterGraph(jobId2) == null);
- cc.getPreDistributedJobStore().checkForExistingDistributedJobDescriptor(jobId2);
- }
-
- @AfterClass
- public static void deinit() throws Exception {
- nc2.stop();
- nc1.stop();
- cc.stop();
- }
-}
diff --git a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java
index 445a15c..bb28c79 100644
--- a/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-hdfs/hyracks-hdfs-core/src/test/java/org/apache/hyracks/hdfs/scheduler/SchedulerTest.java
@@ -97,10 +97,10 @@
Map<String, NodeControllerInfo> ncNameToNcInfos = TestUtils.generateNodeControllerInfo(4, "nc", "10.0.0.",
dataPort, resultPort, messagingPort);
ncNameToNcInfos.put("nc7",
- new NodeControllerInfo("nc7", NodeStatus.ALIVE, new NetworkAddress("10.0.0.7", dataPort),
+ new NodeControllerInfo("nc7", NodeStatus.ACTIVE, new NetworkAddress("10.0.0.7", dataPort),
new NetworkAddress("10.0.0.5", resultPort), new NetworkAddress("10.0.0.5", messagingPort), 2));
ncNameToNcInfos.put("nc12",
- new NodeControllerInfo("nc12", NodeStatus.ALIVE, new NetworkAddress("10.0.0.12", dataPort),
+ new NodeControllerInfo("nc12", NodeStatus.ACTIVE, new NetworkAddress("10.0.0.12", dataPort),
new NetworkAddress("10.0.0.5", resultPort), new NetworkAddress("10.0.0.5", messagingPort), 2));
InputSplit[] fileSplits = new InputSplit[12];
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 d64858b..71ddbc0 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
@@ -49,8 +49,8 @@
// Constants
private static final int LOW_WRITE_BUFFER_WATER_MARK = 8 * 1024;
private static final int HIGH_WRITE_BUFFER_WATER_MARK = 32 * 1024;
- protected static final WriteBufferWaterMark WRITE_BUFFER_WATER_MARK = new WriteBufferWaterMark(
- LOW_WRITE_BUFFER_WATER_MARK, HIGH_WRITE_BUFFER_WATER_MARK);
+ protected static final WriteBufferWaterMark WRITE_BUFFER_WATER_MARK =
+ new WriteBufferWaterMark(LOW_WRITE_BUFFER_WATER_MARK, HIGH_WRITE_BUFFER_WATER_MARK);
protected static final int RECEIVE_BUFFER_SIZE = 4096;
protected static final int DEFAULT_NUM_EXECUTOR_THREADS = 16;
protected static final int DEFAULT_REQUEST_QUEUE_SIZE = 256;
@@ -92,8 +92,8 @@
long directMemoryBudget = numExecutorThreads * (long) HIGH_WRITE_BUFFER_WATER_MARK
+ numExecutorThreads * HttpServerInitializer.RESPONSE_CHUNK_SIZE;
LOGGER.log(Level.INFO, "The output direct memory budget for this server is " + directMemoryBudget + " bytes");
- long inputBudgetEstimate = (long) HttpServerInitializer.MAX_REQUEST_INITIAL_LINE_LENGTH
- * (requestQueueSize + numExecutorThreads);
+ long inputBudgetEstimate =
+ (long) HttpServerInitializer.MAX_REQUEST_INITIAL_LINE_LENGTH * (requestQueueSize + numExecutorThreads);
inputBudgetEstimate = inputBudgetEstimate * 2;
LOGGER.log(Level.INFO,
"The \"estimated\" input direct memory budget for this server is " + inputBudgetEstimate + " bytes");
@@ -111,7 +111,7 @@
doStart();
setStarted();
} catch (Throwable e) { // NOSONAR
- LOGGER.log(Level.SEVERE, "Failure starting an Http Server", e);
+ LOGGER.log(Level.SEVERE, "Failure starting an Http Server with port: " + port, e);
setFailed(e);
throw e;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTree.java
index 1fbcbb0..63c54c3 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/main/java/org/apache/hyracks/storage/am/btree/impls/BTree.java
@@ -49,10 +49,11 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexTupleReference;
import org.apache.hyracks.storage.am.common.frames.FrameOpSpaceStatus;
import org.apache.hyracks.storage.am.common.impls.AbstractTreeIndex;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NodeFrontier;
import org.apache.hyracks.storage.am.common.impls.TreeIndexDiskOrderScanCursor;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
@@ -118,7 +119,7 @@
// Stack validation protocol:
// * parent pushes the validation information onto the stack before validation
// * child pops the validation information off of the stack after validating
- BTreeAccessor accessor = createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ BTreeAccessor accessor = createAccessor(NoOpIndexAccessParameters.INSTANCE);
PageValidationInfo pvi = accessor.ctx.createPageValidationInfo(null);
accessor.ctx.getValidationInfos().addFirst(pvi);
if (isActive) {
@@ -818,9 +819,8 @@
}
@Override
- public BTreeAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- return new BTreeAccessor(this, modificationCallback, searchCallback);
+ public BTreeAccessor createAccessor(IIndexAccessParameters iap) {
+ return new BTreeAccessor(this, iap.getModificationCallback(), iap.getSearchOperationCallback());
}
public BTreeAccessor createAccessor(IModificationOperationCallback modificationCallback,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
index 19b8a68..64f8263 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-btree/src/test/java/org/apache/hyracks/storage/am/btree/test/FramewriterTest.java
@@ -336,10 +336,10 @@
int j = 0;
for (int i = 0; i < indexAccessors.length; i++) {
indexes[j] = Mockito.mock(ITreeIndex.class);
- Mockito.when(indexes[j].createAccessor(Mockito.any(), Mockito.any())).thenReturn(indexAccessors[i]);
+ Mockito.when(indexes[j].createAccessor(Mockito.any())).thenReturn(indexAccessors[i]);
j++;
indexes[j] = Mockito.mock(ITreeIndex.class);
- Mockito.when(indexes[j].createAccessor(Mockito.any(), Mockito.any()))
+ Mockito.when(indexes[j].createAccessor(Mockito.any()))
.thenThrow(new HyracksDataException("failed to create accessor"));
j++;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
index 5fc07ad..095159b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexBulkLoadOperatorNodePushable.java
@@ -65,7 +65,7 @@
index = indexHelper.getIndexInstance();
try {
writer.open();
- bulkLoader = index.createBulkLoader(fillFactor, verifyInput, numElementsHint, checkIfEmptyIndex);
+ initializeBulkLoader();
} catch (Exception e) {
throw HyracksDataException.create(e);
}
@@ -116,4 +116,8 @@
writer.fail();
}
}
+
+ protected void initializeBulkLoader() throws HyracksDataException {
+ bulkLoader = index.createBulkLoader(fillFactor, verifyInput, numElementsHint, checkIfEmptyIndex);
+ }
}
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
index e80a837..35accc3 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexInsertUpdateDeleteOperatorNodePushable.java
@@ -34,10 +34,12 @@
import org.apache.hyracks.storage.am.common.api.IModificationOperationCallbackFactory;
import org.apache.hyracks.storage.am.common.api.ITupleFilter;
import org.apache.hyracks.storage.am.common.api.ITupleFilterFactory;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.common.IIndex;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.LocalResource;
@@ -81,7 +83,8 @@
writer.open();
LocalResource resource = indexHelper.getResource();
modCallback = modOpCallbackFactory.createModificationOperationCallback(resource, ctx, this);
- indexAccessor = index.createAccessor(modCallback, NoOpOperationCallback.INSTANCE);
+ IIndexAccessParameters iap = new IndexAccessParameters(modCallback, NoOpOperationCallback.INSTANCE);
+ indexAccessor = index.createAccessor(iap);
if (tupleFilterFactory != null) {
tupleFilter = tupleFilterFactory.createTupleFilter(ctx);
frameTuple = new FrameTupleReference();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
index 1e3d5f0..132149b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/IndexSearchOperatorNodePushable.java
@@ -41,9 +41,11 @@
import org.apache.hyracks.dataflow.std.base.AbstractUnaryInputUnaryOutputOperatorNodePushable;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
import org.apache.hyracks.storage.am.common.api.ISearchOperationCallbackFactory;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.tuples.PermutingFrameTupleReference;
import org.apache.hyracks.storage.common.IIndex;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
@@ -150,7 +152,8 @@
appender = new FrameTupleAppender(new VSizeFrame(ctx), true);
ISearchOperationCallback searchCallback =
searchCallbackFactory.createSearchOperationCallback(indexHelper.getResource().getId(), ctx, null);
- indexAccessor = index.createAccessor(NoOpOperationCallback.INSTANCE, searchCallback);
+ IIndexAccessParameters iap = new IndexAccessParameters(NoOpOperationCallback.INSTANCE, searchCallback);
+ indexAccessor = index.createAccessor(iap);
cursor = createCursor();
if (retainInput) {
frameTuple = new FrameTupleReference();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
index bc7cb85..dc86c74 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/dataflow/TreeIndexDiskOrderScanOperatorNodePushable.java
@@ -34,8 +34,10 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrame;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.impls.TreeIndexDiskOrderScanCursor;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.LocalResource;
@@ -62,8 +64,8 @@
LocalResource resource = treeIndexHelper.getResource();
ISearchOperationCallback searchCallback =
searchCallbackFactory.createSearchOperationCallback(resource.getId(), ctx, null);
- ITreeIndexAccessor indexAccessor =
- (ITreeIndexAccessor) treeIndex.createAccessor(NoOpOperationCallback.INSTANCE, searchCallback);
+ IIndexAccessParameters iap = new IndexAccessParameters(NoOpOperationCallback.INSTANCE, searchCallback);
+ ITreeIndexAccessor indexAccessor = (ITreeIndexAccessor) treeIndex.createAccessor(iap);
try {
writer.open();
indexAccessor.diskOrderScan(cursor);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/AbstractTreeIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/AbstractTreeIndex.java
index 1221458..453431d 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/AbstractTreeIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/AbstractTreeIndex.java
@@ -308,8 +308,7 @@
ITreeIndexAccessor accessor;
public TreeIndexInsertBulkLoader() throws HyracksDataException {
- accessor =
- (ITreeIndexAccessor) createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ accessor = (ITreeIndexAccessor) createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/IndexAccessParameters.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/IndexAccessParameters.java
new file mode 100644
index 0000000..3f97aa2
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/IndexAccessParameters.java
@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.storage.am.common.impls;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+import org.apache.hyracks.storage.common.ISearchOperationCallback;
+
+public class IndexAccessParameters implements IIndexAccessParameters {
+
+ protected final IModificationOperationCallback modificationCallback;
+ protected final ISearchOperationCallback searchOperationCallback;
+ // This map is used to put additional parameters to an index accessor.
+ protected Map<String, Object> paramMap = null;
+
+ public IndexAccessParameters(IModificationOperationCallback modificationCallback,
+ ISearchOperationCallback searchOperationCallback) {
+ this.modificationCallback = modificationCallback;
+ this.searchOperationCallback = searchOperationCallback;
+ }
+
+ @Override
+ public IModificationOperationCallback getModificationCallback() {
+ return modificationCallback;
+ }
+
+ @Override
+ public ISearchOperationCallback getSearchOperationCallback() {
+ return searchOperationCallback;
+ }
+
+ @Override
+ public Map<String, Object> getParameters() {
+ if (paramMap == null) {
+ paramMap = new HashMap<String, Object>();
+ }
+ return paramMap;
+ }
+
+}
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpIndexAccessParameters.java b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpIndexAccessParameters.java
new file mode 100644
index 0000000..3618cae
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-common/src/main/java/org/apache/hyracks/storage/am/common/impls/NoOpIndexAccessParameters.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.storage.am.common.impls;
+
+import java.util.Map;
+
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+import org.apache.hyracks.storage.common.ISearchOperationCallback;
+
+public class NoOpIndexAccessParameters implements IIndexAccessParameters {
+ public static final NoOpIndexAccessParameters INSTANCE = new NoOpIndexAccessParameters();
+
+ private NoOpIndexAccessParameters() {
+ }
+
+ @Override
+ public IModificationOperationCallback getModificationCallback() {
+ return NoOpOperationCallback.INSTANCE;
+ }
+
+ @Override
+ public ISearchOperationCallback getSearchOperationCallback() {
+ return NoOpOperationCallback.INSTANCE;
+ }
+
+ @Override
+ public Map<String, Object> getParameters() {
+ return null;
+ }
+
+}
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeLocalResource.java
index 6083637..673bd3b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeLocalResource.java
@@ -57,10 +57,11 @@
public ILSMIndex createInstance(INCServiceContext serviceCtx) throws HyracksDataException {
IIOManager ioManager = serviceCtx.getIoManager();
FileReference file = ioManager.resolve(path);
+ ioOpCallbackFactory.initialize(serviceCtx);
return LSMBTreeUtil.createExternalBTree(ioManager, file, storageManager.getBufferCache(serviceCtx), typeTraits,
cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate,
mergePolicyFactory.createMergePolicy(mergePolicyProperties, serviceCtx),
opTrackerProvider.getOperationTracker(serviceCtx), ioSchedulerProvider.getIoScheduler(serviceCtx),
- ioOpCallbackFactory, durable, metadataPageManagerFactory);
+ ioOpCallbackFactory, durable, metadataPageManagerFactory, serviceCtx.getTracer());
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyLocalResource.java
index 04b63f9..7e44c63 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/ExternalBTreeWithBuddyLocalResource.java
@@ -60,10 +60,11 @@
public ILSMIndex createInstance(INCServiceContext serviceCtx) throws HyracksDataException {
IIOManager ioManager = serviceCtx.getIoManager();
FileReference file = ioManager.resolve(path);
+ ioOpCallbackFactory.initialize(serviceCtx);
return LSMBTreeUtil.createExternalBTreeWithBuddy(ioManager, file, storageManager.getBufferCache(serviceCtx),
typeTraits, cmpFactories, bloomFilterFalsePositiveRate,
mergePolicyFactory.createMergePolicy(mergePolicyProperties, serviceCtx),
opTrackerProvider.getOperationTracker(serviceCtx), ioSchedulerProvider.getIoScheduler(serviceCtx),
- ioOpCallbackFactory, bloomFilterKeyFields, durable, metadataPageManagerFactory);
+ ioOpCallbackFactory, bloomFilterKeyFields, durable, metadataPageManagerFactory, serviceCtx.getTracer());
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeLocalResource.java
index dfa88da..1988736 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/dataflow/LSMBTreeLocalResource.java
@@ -70,6 +70,7 @@
IIOManager ioManager = serviceCtx.getIoManager();
FileReference file = ioManager.resolve(path);
List<IVirtualBufferCache> vbcs = vbcProvider.getVirtualBufferCaches(serviceCtx, file);
+ ioOpCallbackFactory.initialize(serviceCtx);
//TODO: enable updateAwareness for secondary LSMBTree indexes
boolean updateAware = false;
return LSMBTreeUtil.createLSMTree(ioManager, vbcs, file, storageManager.getBufferCache(serviceCtx), typeTraits,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java
index 1ca4a6f..5b6ff9e 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTree.java
@@ -41,6 +41,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentBulkLoader;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
@@ -50,18 +51,18 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.ITwoPCIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.BlockingIOOperationCallbackWrapper;
import org.apache.hyracks.storage.am.lsm.common.impls.ExternalIndexHarness;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentFileReferences;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMTreeIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMTreeIndexAccessor.ICursorFactory;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.util.trace.ITracer;
/**
* This is an lsm b-tree that does not have memory component and is modified
@@ -94,18 +95,18 @@
ILSMDiskComponentFactory bulkLoadComponentFactory, ILSMDiskComponentFactory transactionComponentFactory,
double bloomFilterFalsePositiveRate, IBinaryComparatorFactory[] cmpFactories, ILSMMergePolicy mergePolicy,
ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
- ILSMIOOperationCallbackFactory ioOpCallbackFactory, boolean durable) {
+ ILSMIOOperationCallbackFactory ioOpCallbackFactory, boolean durable, ITracer tracer) {
super(ioManager, insertLeafFrameFactory, deleteLeafFrameFactory, bufferCache, fileManager, componentFactory,
bulkLoadComponentFactory, bloomFilterFalsePositiveRate, cmpFactories, mergePolicy, opTracker,
- ioScheduler, ioOpCallbackFactory, false, durable);
+ ioScheduler, ioOpCallbackFactory, false, durable, tracer);
this.transactionComponentFactory = transactionComponentFactory;
this.secondDiskComponents = new LinkedList<>();
this.interiorFrameFactory = interiorFrameFactory;
}
@Override
- public ExternalIndexHarness getLsmHarness() {
- return (ExternalIndexHarness) super.getLsmHarness();
+ public ExternalIndexHarness getHarness() {
+ return (ExternalIndexHarness) super.getHarness();
}
// The subsume merged components is overridden to account for:
@@ -162,9 +163,9 @@
// This method creates the appropriate opContext for the targeted version
public ExternalBTreeOpContext createOpContext(ISearchOperationCallback searchCallback, int targetVersion) {
- return new ExternalBTreeOpContext(insertLeafFrameFactory, deleteLeafFrameFactory, searchCallback,
+ return new ExternalBTreeOpContext(this, insertLeafFrameFactory, deleteLeafFrameFactory, searchCallback,
((LSMBTreeWithBloomFilterDiskComponentFactory) componentFactory).getBloomFilterKeyFields().length,
- cmpFactories, targetVersion, getLsmHarness());
+ cmpFactories, targetVersion, getHarness(), tracer);
}
// The only reason to override the following method is that it uses a different context object
@@ -194,7 +195,7 @@
FileReference lastFile = lastBTree.getFileReference();
LSMComponentFileReferences relMergeFileRefs =
fileManager.getRelMergeFileReference(firstFile.getFile().getName(), lastFile.getFile().getName());
- ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
+ ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
ioScheduler.scheduleOperation(new LSMBTreeMergeOperation(accessor, cursor,
relMergeFileRefs.getInsertIndexFileReference(), relMergeFileRefs.getBloomFilterFileReference(),
callback, fileManager.getBaseDir().getAbsolutePath()));
@@ -259,7 +260,7 @@
diskComponents.add(component);
secondDiskComponents.add(component);
}
- getLsmHarness().indexFirstTimeActivated();
+ getHarness().indexFirstTimeActivated();
} else {
// This index has been opened before
for (ILSMDiskComponent c : diskComponents) {
@@ -288,7 +289,7 @@
}
if (flushOnExit) {
BlockingIOOperationCallbackWrapper cb = new BlockingIOOperationCallbackWrapper(ioOpCallback);
- cb.afterFinalize(LSMOperationType.FLUSH, null);
+ cb.afterFinalize(LSMIOOperationType.FLUSH, null);
}
for (ILSMDiskComponent c : diskComponents) {
c.deactivateAndPurge();
@@ -309,7 +310,7 @@
if (!isActive) {
throw new HyracksDataException("Failed to clear the index since it is not activated.");
}
- getLsmHarness().indexClear();
+ getHarness().indexClear();
for (ILSMDiskComponent c : diskComponents) {
c.deactivateAndDestroy();
@@ -451,7 +452,7 @@
component.markAsValid(durable);
component.deactivate();
} else {
- getLsmHarness().addBulkLoadedComponent(component);
+ getHarness().addBulkLoadedComponent(component);
}
}
}
@@ -488,17 +489,16 @@
// The accessor for disk only indexes don't use modification callback and always carry the target index version with them
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- ExternalBTreeOpContext opCtx = createOpContext(searchCallback, version);
- return new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) {
+ ExternalBTreeOpContext opCtx = createOpContext(iap.getSearchOperationCallback(), version);
+ return new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
}
@Override
public ILSMIndexAccessor createAccessor(ISearchOperationCallback searchCallback, int targetIndexVersion)
throws HyracksDataException {
ExternalBTreeOpContext opCtx = createOpContext(searchCallback, targetIndexVersion);
- return new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
+ return new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
}
@Override
@@ -554,7 +554,7 @@
component = createDiskComponent(componentFactory, componentFileReferences.getInsertIndexFileReference(),
null, componentFileReferences.getBloomFilterFileReference(), false);
}
- getLsmHarness().addTransactionComponents(component);
+ getHarness().addTransactionComponents(component);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeOpContext.java
index f94c38a..b0c31ad 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeOpContext.java
@@ -22,9 +22,11 @@
import org.apache.hyracks.storage.am.btree.api.IBTreeLeafFrame;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.hyracks.util.trace.ITracer;
public class ExternalBTreeOpContext extends AbstractLSMIndexOperationContext {
private IBTreeLeafFrame insertLeafFrame;
@@ -34,11 +36,11 @@
private final int targetIndexVersion;
private LSMBTreeCursorInitialState searchInitialState;
- public ExternalBTreeOpContext(ITreeIndexFrameFactory insertLeafFrameFactory,
+ public ExternalBTreeOpContext(ILSMIndex index, ITreeIndexFrameFactory insertLeafFrameFactory,
ITreeIndexFrameFactory deleteLeafFrameFactory, ISearchOperationCallback searchCallback,
int numBloomFilterKeyFields, IBinaryComparatorFactory[] cmpFactories, int targetIndexVersion,
- ILSMHarness lsmHarness) {
- super(null, null, null, searchCallback, null);
+ ILSMHarness lsmHarness, ITracer tracer) {
+ super(index, null, null, null, searchCallback, null, tracer);
if (cmpFactories != null) {
this.cmp = MultiComparator.create(cmpFactories);
} else {
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
index 57f956b..c6ce339 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddy.java
@@ -44,6 +44,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentBulkLoader;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
@@ -53,18 +54,19 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.ITwoPCIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
import org.apache.hyracks.storage.am.lsm.common.impls.ExternalIndexHarness;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentFileReferences;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMTreeIndexAccessor;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.util.trace.ITracer;
public class ExternalBTreeWithBuddy extends AbstractLSMIndex implements ITreeIndex, ITwoPCIndex {
@@ -88,9 +90,10 @@
ILSMDiskComponentFactory bulkLoadComponentFactory, double bloomFilterFalsePositiveRate,
ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
ILSMIOOperationCallbackFactory ioOpCallbackFactory, IBinaryComparatorFactory[] btreeCmpFactories,
- IBinaryComparatorFactory[] buddyBtreeCmpFactories, int[] buddyBTreeFields, boolean durable) {
+ IBinaryComparatorFactory[] buddyBtreeCmpFactories, int[] buddyBTreeFields, boolean durable,
+ ITracer tracer) {
super(ioManager, diskBufferCache, fileManager, bloomFilterFalsePositiveRate, mergePolicy, opTracker,
- ioScheduler, ioOpCallbackFactory, componentFactory, bulkLoadComponentFactory, durable);
+ ioScheduler, ioOpCallbackFactory, componentFactory, bulkLoadComponentFactory, durable, tracer);
this.btreeCmpFactories = btreeCmpFactories;
this.buddyBtreeCmpFactories = buddyBtreeCmpFactories;
this.buddyBTreeFields = buddyBTreeFields;
@@ -124,7 +127,7 @@
diskComponents.add(component);
secondDiskComponents.add(component);
}
- ((ExternalIndexHarness) getLsmHarness()).indexFirstTimeActivated();
+ ((ExternalIndexHarness) getHarness()).indexFirstTimeActivated();
} else {
// This index has been opened before or is brand new with no
// components. It should also maintain the version pointer
@@ -146,7 +149,7 @@
if (!isActive) {
throw new HyracksDataException("Failed to clear the index since it is not activated.");
}
- ((ExternalIndexHarness) getLsmHarness()).indexClear();
+ ((ExternalIndexHarness) getHarness()).indexClear();
for (ILSMDiskComponent c : diskComponents) {
c.deactivateAndDestroy();
// Remove from second list to avoid destroying twice
@@ -180,9 +183,8 @@
}
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException {
- return new LSMTreeIndexAccessor(getLsmHarness(), createOpContext(searchCallback, version),
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) throws HyracksDataException {
+ return new LSMTreeIndexAccessor(getHarness(), createOpContext(iap.getSearchOperationCallback(), version),
ctx -> new LSMBTreeWithBuddySearchCursor(ctx, buddyBTreeFields));
}
@@ -273,7 +275,7 @@
List<ILSMComponent> mergingComponents = ctx.getComponentHolder();
ITreeIndexCursor cursor = new LSMBTreeWithBuddySortedCursor(bctx, buddyBTreeFields);
LSMComponentFileReferences relMergeFileRefs = getMergeTargetFileName(mergingComponents);
- ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getLsmHarness(), bctx,
+ ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getHarness(), bctx,
opCtx -> new LSMBTreeWithBuddySearchCursor(opCtx, buddyBTreeFields));
// Since we have two lists of components, to tell whether we need to
@@ -296,9 +298,9 @@
// This method creates the appropriate opContext for the targeted version
public ExternalBTreeWithBuddyOpContext createOpContext(ISearchOperationCallback searchCallback, int targetVersion) {
- return new ExternalBTreeWithBuddyOpContext(btreeCmpFactories, buddyBtreeCmpFactories, searchCallback,
- targetVersion, getLsmHarness(), btreeInteriorFrameFactory, btreeLeafFrameFactory,
- buddyBtreeLeafFrameFactory);
+ return new ExternalBTreeWithBuddyOpContext(this, btreeCmpFactories, buddyBtreeCmpFactories, searchCallback,
+ targetVersion, getHarness(), btreeInteriorFrameFactory, btreeLeafFrameFactory,
+ buddyBtreeLeafFrameFactory, tracer);
}
@Override
@@ -432,7 +434,7 @@
throw new HyracksDataException("Failed to deactivate the index since it is already deactivated.");
}
if (flushOnExit) {
- ioOpCallback.afterFinalize(LSMOperationType.FLUSH, null);
+ ioOpCallback.afterFinalize(LSMIOOperationType.FLUSH, null);
}
// Even though, we deactivate the index, we don't exit components or
// modify any of the lists to make sure they
@@ -528,7 +530,7 @@
component.markAsValid(durable);
component.deactivate();
} else {
- getLsmHarness().addBulkLoadedComponent(component);
+ getHarness().addBulkLoadedComponent(component);
}
}
}
@@ -564,7 +566,7 @@
@Override
public ILSMIndexAccessor createAccessor(ISearchOperationCallback searchCallback, int targetIndexVersion)
throws HyracksDataException {
- return new LSMTreeIndexAccessor(getLsmHarness(), createOpContext(searchCallback, targetIndexVersion),
+ return new LSMTreeIndexAccessor(getHarness(), createOpContext(searchCallback, targetIndexVersion),
ctx -> new LSMBTreeWithBuddySearchCursor(ctx, buddyBTreeFields));
}
@@ -609,7 +611,7 @@
componentFileRefrences.getDeleteIndexFileReference(),
componentFileRefrences.getBloomFilterFileReference(), false);
}
- ((ExternalIndexHarness) getLsmHarness()).addTransactionComponents(component);
+ ((ExternalIndexHarness) getHarness()).addTransactionComponents(component);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddyOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddyOpContext.java
index d5cd2e2..85d4ab2 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddyOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/ExternalBTreeWithBuddyOpContext.java
@@ -22,10 +22,12 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.hyracks.util.trace.ITracer;
public class ExternalBTreeWithBuddyOpContext extends AbstractLSMIndexOperationContext {
private MultiComparator bTreeCmp;
@@ -33,11 +35,12 @@
private final int targetIndexVersion;
private LSMBTreeWithBuddyCursorInitialState searchInitialState;
- public ExternalBTreeWithBuddyOpContext(IBinaryComparatorFactory[] btreeCmpFactories,
+ public ExternalBTreeWithBuddyOpContext(ILSMIndex index, IBinaryComparatorFactory[] btreeCmpFactories,
IBinaryComparatorFactory[] buddyBtreeCmpFactories, ISearchOperationCallback searchCallback,
int targetIndexVersion, ILSMHarness lsmHarness, ITreeIndexFrameFactory btreeInteriorFrameFactory,
- ITreeIndexFrameFactory btreeLeafFrameFactory, ITreeIndexFrameFactory buddyBtreeLeafFrameFactory) {
- super(null, null, null, searchCallback, null);
+ ITreeIndexFrameFactory btreeLeafFrameFactory, ITreeIndexFrameFactory buddyBtreeLeafFrameFactory,
+ ITracer tracer) {
+ super(index, null, null, null, searchCallback, null, tracer);
this.targetIndexVersion = targetIndexVersion;
this.bTreeCmp = MultiComparator.create(btreeCmpFactories);
this.buddyBTreeCmp = MultiComparator.create(buddyBtreeCmpFactories);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
index 640e095..6929530 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTree.java
@@ -37,7 +37,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.btree.tuples.LSMBTreeTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.AbstractLSMWithBloomFilterDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentFilterHelper;
@@ -63,6 +63,7 @@
import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentFilterManager;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMTreeIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMTreeIndexAccessor.ICursorFactory;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
@@ -124,9 +125,10 @@
ILSMDiskComponentFactory componentFactory, ILSMDiskComponentFactory bulkLoadComponentFactory,
double bloomFilterFalsePositiveRate, IBinaryComparatorFactory[] cmpFactories, ILSMMergePolicy mergePolicy,
ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
- ILSMIOOperationCallbackFactory ioOpCallbackFactory, boolean needKeyDupCheck, boolean durable) {
+ ILSMIOOperationCallbackFactory ioOpCallbackFactory, boolean needKeyDupCheck, boolean durable,
+ ITracer tracer) {
super(ioManager, bufferCache, fileManager, bloomFilterFalsePositiveRate, mergePolicy, opTracker, ioScheduler,
- ioOpCallbackFactory, componentFactory, bulkLoadComponentFactory, durable);
+ ioOpCallbackFactory, componentFactory, bulkLoadComponentFactory, durable, tracer);
this.insertLeafFrameFactory = insertLeafFrameFactory;
this.deleteLeafFrameFactory = deleteLeafFrameFactory;
this.cmpFactories = cmpFactories;
@@ -247,8 +249,7 @@
public ILSMDiskComponent doFlush(ILSMIOOperation operation) throws HyracksDataException {
LSMBTreeFlushOperation flushOp = (LSMBTreeFlushOperation) operation;
LSMBTreeMemoryComponent flushingComponent = (LSMBTreeMemoryComponent) flushOp.getFlushingComponent();
- IIndexAccessor accessor = flushingComponent.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ IIndexAccessor accessor = flushingComponent.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
RangePredicate nullPred = new RangePredicate(null, null, true, true, null, null);
long numElements = 0L;
@@ -364,20 +365,20 @@
public LSMBTreeOpContext createOpContext(IModificationOperationCallback modificationCallback,
ISearchOperationCallback searchCallback) {
int numBloomFilterKeyFields = hasBloomFilter
- ? ((LSMBTreeWithBloomFilterDiskComponentFactory) componentFactory).getBloomFilterKeyFields().length : 0;
- return new LSMBTreeOpContext(memoryComponents, insertLeafFrameFactory, deleteLeafFrameFactory,
+ ? ((LSMBTreeWithBloomFilterDiskComponentFactory) componentFactory).getBloomFilterKeyFields().length
+ : 0;
+ return new LSMBTreeOpContext(this, memoryComponents, insertLeafFrameFactory, deleteLeafFrameFactory,
modificationCallback, searchCallback, numBloomFilterKeyFields, getTreeFields(), getFilterFields(),
- getLsmHarness(), getFilterCmpFactories());
+ getHarness(), getFilterCmpFactories(), tracer);
}
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- return createAccessor(createOpContext(modificationCallback, searchCallback));
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) {
+ return createAccessor(createOpContext(iap.getModificationCallback(), iap.getSearchOperationCallback()));
}
public ILSMIndexAccessor createAccessor(AbstractLSMIndexOperationContext opCtx) {
- return new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
+ return new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponent.java
index a8e707f..d759167 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponent.java
@@ -24,11 +24,10 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndex;
-public class LSMBTreeDiskComponent extends AbstractLSMDiskComponent implements ILSMDiskComponent {
+public class LSMBTreeDiskComponent extends AbstractLSMDiskComponent {
protected final BTree btree;
public LSMBTreeDiskComponent(AbstractLSMIndex lsmIndex, BTree btree, ILSMComponentFilter filter) {
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
index 02e481c..2f77504 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeDiskComponentScanCursor.java
@@ -30,7 +30,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.btree.impls.BTree.BTreeAccessor;
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.btree.tuples.LSMBTreeTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
@@ -78,7 +78,7 @@
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
BTree btree = (BTree) component.getIndex();
- btreeAccessors[i] = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
btreeAccessors[i].search(rangeCursors[i], searchPred);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java
index 08ba7af..9cab94e 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeOpContext.java
@@ -28,14 +28,18 @@
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.hyracks.util.trace.ITracer;
public final class LSMBTreeOpContext extends AbstractLSMIndexOperationContext {
@@ -60,11 +64,12 @@
private BTree.BTreeAccessor currentMutableBTreeAccessor;
private BTreeOpContext currentMutableBTreeOpCtx;
- public LSMBTreeOpContext(List<ILSMMemoryComponent> mutableComponents, ITreeIndexFrameFactory insertLeafFrameFactory,
- ITreeIndexFrameFactory deleteLeafFrameFactory, IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback, int numBloomFilterKeyFields, int[] btreeFields, int[] filterFields,
- ILSMHarness lsmHarness, IBinaryComparatorFactory[] filterCmpFactories) {
- super(btreeFields, filterFields, filterCmpFactories, searchCallback, modificationCallback);
+ public LSMBTreeOpContext(ILSMIndex index, List<ILSMMemoryComponent> mutableComponents,
+ ITreeIndexFrameFactory insertLeafFrameFactory, ITreeIndexFrameFactory deleteLeafFrameFactory,
+ IModificationOperationCallback modificationCallback, ISearchOperationCallback searchCallback,
+ int numBloomFilterKeyFields, int[] btreeFields, int[] filterFields, ILSMHarness lsmHarness,
+ IBinaryComparatorFactory[] filterCmpFactories, ITracer tracer) {
+ super(index, btreeFields, filterFields, filterCmpFactories, searchCallback, modificationCallback, tracer);
LSMBTreeMemoryComponent c = (LSMBTreeMemoryComponent) mutableComponents.get(0);
IBinaryComparatorFactory cmpFactories[] = c.getIndex().getComparatorFactories();
if (cmpFactories[0] != null) {
@@ -86,9 +91,9 @@
mutableBTreeAccessors[i] = mutableBTrees[i].createAccessor(modificationCallback,
NoOpOperationCallback.INSTANCE, allFields);
} else {
-
- mutableBTreeAccessors[i] =
- mutableBTrees[i].createAccessor(modificationCallback, NoOpOperationCallback.INSTANCE);
+ IIndexAccessParameters iap =
+ new IndexAccessParameters(modificationCallback, NoOpOperationCallback.INSTANCE);
+ mutableBTreeAccessors[i] = mutableBTrees[i].createAccessor(iap);
}
mutableBTreeOpCtxs[i] = mutableBTreeAccessors[i].getOpContext();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
index 24a78a6..b84a172 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreePointSearchCursor.java
@@ -30,6 +30,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType;
@@ -199,8 +200,7 @@
bloomFilters[i] = ((LSMBTreeWithBloomFilterDiskComponent) component).getBloomFilter();
}
if (btreeAccessors[i] == null) {
- btreeAccessors[i] =
- btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
} else {
// re-use
btreeAccessors[i].reset(btree, NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
index 7f93b62..3e14fb9 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeRangeSearchCursor.java
@@ -31,10 +31,13 @@
import org.apache.hyracks.storage.am.btree.impls.BTree.BTreeAccessor;
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.ComponentState;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
+import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMMemoryComponent;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMIndexSearchCursor;
import org.apache.hyracks.storage.common.ICursorInitialState;
import org.apache.hyracks.storage.common.IIndexCursor;
@@ -46,10 +49,11 @@
private final RangePredicate reusablePred;
private ISearchOperationCallback searchCallback;
- private RangePredicate predicate;
+
private BTreeAccessor[] btreeAccessors;
private ArrayTupleBuilder tupleBuilder;
private boolean canCallProceed = true;
+ private int tupleFromMemoryComponentCount = 0;
public LSMBTreeRangeSearchCursor(ILSMIndexOperationContext opCtx) {
this(opCtx, false);
@@ -72,6 +76,9 @@
outputElement = outputPriorityQueue.poll();
needPushElementIntoQueue = true;
canCallProceed = false;
+ if (outputElement.getCursorIndex() == 0) {
+ tupleFromMemoryComponentCount++;
+ }
}
/**
@@ -86,6 +93,15 @@
*/
@Override
protected void checkPriorityQueue() throws HyracksDataException {
+ // Every SWITCH_COMPONENT_CYCLE calls, check if memory components need to be swapped with disk components
+ // We should do this regardless of the value of includeMutableComponent. This is because if the cursor
+ // of the memory component has gone past the end of the in memory component, then the includeMutableComponent
+ // will be set to false. Still, when that happens, we want to exit the memory component to allow it to be
+ // recycled and used for modifications.
+ if (hasNextCallCount >= SWITCH_COMPONENT_CYCLE) {
+ replaceMemoryComponentWithDiskComponentIfNeeded();
+ hasNextCallCount = 0;
+ }
while (!outputPriorityQueue.isEmpty() || needPushElementIntoQueue) {
if (!outputPriorityQueue.isEmpty()) {
PriorityQueueElement queueHead = outputPriorityQueue.peek();
@@ -96,7 +112,7 @@
if (!searchCallback.proceed(queueHead.getTuple())) {
// In case proceed() fails and there is an in-memory component,
// we can't simply use this element since there might be a change.
- PriorityQueueElement mutableElement = removeMutable(outputPriorityQueue);
+ PriorityQueueElement mutableElement = remove(outputPriorityQueue, 0);
if (mutableElement != null) {
// Copies the current queue head
if (tupleBuilder == null) {
@@ -165,10 +181,7 @@
} else {
// If the previous tuple and the head tuple are different
// the info of previous tuple is useless
- if (needPushElementIntoQueue == true) {
- pushIntoQueueFromCursorAndReplaceThisElement(outputElement);
- needPushElementIntoQueue = false;
- }
+ pushOutputElementIntoQueueIfNeeded();
canCallProceed = true;
outputElement = null;
}
@@ -184,16 +197,128 @@
}
- private PriorityQueueElement removeMutable(PriorityQueue<PriorityQueueElement> outputPriorityQueue) {
- // Scans the PQ for the mutable component's element and delete it
- // since it can be changed.
- // (i.e. we can't ensure that the element is the most current one.)
+ private void pushOutputElementIntoQueueIfNeeded() throws HyracksDataException {
+ if (needPushElementIntoQueue) {
+ pushIntoQueueFromCursorAndReplaceThisElement(outputElement);
+ needPushElementIntoQueue = false;
+ }
+ }
+
+ private void replaceMemoryComponentWithDiskComponentIfNeeded() throws HyracksDataException {
+ int replaceFrom = replaceFrom();
+ if (replaceFrom < 0) {
+ // no switch is needed, check if we need to re-do the search on the memory component.
+ // searches and modifications compete on the pages of the memory component
+ // if the cursor on the memory component is not advancing, we re-do the operation in order
+ // to release the latches and allow modifications to proceed
+ redoMemoryComponentSearchIfNeeded();
+ return;
+ }
+ opCtx.getIndex().getHarness().replaceMemoryComponentsWithDiskComponents(getOpCtx(), replaceFrom);
+ // redo the search on the new component
+ for (int i = replaceFrom; i < switchRequest.length; i++) {
+ if (switchRequest[i] && switchedElements[i] != null) {
+ copyTuple.reset(switchComponentTupleBuilders[i].getFieldEndOffsets(),
+ switchComponentTupleBuilders[i].getByteArray());
+ reusablePred.setLowKey(copyTuple, true);
+ rangeCursors[i].reset();
+ ILSMComponent component = operationalComponents.get(i);
+ BTree btree = (BTree) component.getIndex();
+ if (i == 0 && component.getType() != LSMComponentType.MEMORY) {
+ includeMutableComponent = false;
+ }
+ btreeAccessors[i].reset(btree, NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i].search(rangeCursors[i], reusablePred);
+ pushIntoQueueFromCursorAndReplaceThisElement(switchedElements[i]);
+ }
+ switchRequest[i] = false;
+ // any failed switch makes further switches pointless
+ switchPossible = switchPossible && operationalComponents.get(i).getType() == LSMComponentType.DISK;
+ }
+ }
+
+ private int replaceFrom() throws HyracksDataException {
+ int replaceFrom = -1;
+ if (!switchPossible) {
+ return replaceFrom;
+ }
+ for (int i = 0; i < operationalComponents.size(); i++) {
+ ILSMComponent next = operationalComponents.get(i);
+ if (next.getType() == LSMComponentType.DISK) {
+ if (i == 0) {
+ // if the first component is a disk component, then switch is not possible
+ switchPossible = false;
+ }
+ break;
+ } else if (next.getState() == ComponentState.UNREADABLE_UNWRITABLE) {
+ // if the component is UNREADABLE_UNWRITABLE, then it means that the flush has been completed while
+ // the search cursor is inside the component, a switch candidate
+ if (replaceFrom < 0) {
+ replaceFrom = i;
+ }
+ // we return the outputElement to the priority queue if it came from this component
+ if (outputElement != null && outputElement.getCursorIndex() == i) {
+ pushIntoQueueFromCursorAndReplaceThisElement(outputElement);
+ needPushElementIntoQueue = false;
+ outputElement = null;
+ canCallProceed = true;
+ }
+ PriorityQueueElement element = remove(outputPriorityQueue, i);
+ // if this cursor is still active (has an element)
+ // then we copy the search key to restart the operation after
+ // replacing the component
+ if (element != null) {
+ if (switchComponentTupleBuilders[i] == null) {
+ switchComponentTupleBuilders[i] = new ArrayTupleBuilder(cmp.getKeyFieldCount());
+ }
+ TupleUtils.copyTuple(switchComponentTupleBuilders[i], element.getTuple(), cmp.getKeyFieldCount());
+ }
+ rangeCursors[i].reset();
+ rangeCursors[i].close();
+ switchRequest[i] = true;
+ switchedElements[i] = element;
+ }
+ }
+ return replaceFrom;
+ }
+
+ private void redoMemoryComponentSearchIfNeeded() throws HyracksDataException {
+ if (!includeMutableComponent) {
+ return;
+ }
+ // if the last n records, none were from memory and there are writers inside the component,
+ // we need to re-do the search so the cursor doesn't block modifications due to latches over page
+ if (tupleFromMemoryComponentCount == 0
+ && ((AbstractLSMMemoryComponent) operationalComponents.get(0)).getWriterCount() > 0) {
+ // When we reach here, we know that the mutable component element is not the outputElement
+ // since if it was the output element, the tupleFromMemoryComponentCount would be at least 1
+ PriorityQueueElement mutableElement = remove(outputPriorityQueue, 0);
+ if (mutableElement != null) {
+ // if the element is null, then there is nothing to do since no latches are held
+ if (tupleBuilder == null) {
+ tupleBuilder = new ArrayTupleBuilder(cmp.getKeyFieldCount());
+ }
+ TupleUtils.copyTuple(tupleBuilder, mutableElement.getTuple(), cmp.getKeyFieldCount());
+ copyTuple.reset(tupleBuilder.getFieldEndOffsets(), tupleBuilder.getByteArray());
+ // Unlatches/unpins the leaf page of the index.
+ rangeCursors[0].reset();
+ // Re-traverses the index.
+ reusablePred.setLowKey(copyTuple, true);
+ btreeAccessors[0].search(rangeCursors[0], reusablePred);
+ includeMutableComponent = pushIntoQueueFromCursorAndReplaceThisElement(mutableElement);
+ }
+ }
+ tupleFromMemoryComponentCount = 0;
+ }
+
+ private PriorityQueueElement remove(PriorityQueue<PriorityQueueElement> outputPriorityQueue, int cursorIndex) {
+ // Scans the PQ for the component's element and delete it
Iterator<PriorityQueueElement> it = outputPriorityQueue.iterator();
while (it.hasNext()) {
- PriorityQueueElement mutableElement = it.next();
- if (mutableElement.getCursorIndex() == 0) {
+ PriorityQueueElement e = it.next();
+ if (e.getCursorIndex() == cursorIndex) {
it.remove();
- return mutableElement;
+ return e;
}
}
return null;
@@ -206,7 +331,7 @@
operationalComponents = lsmInitialState.getOperationalComponents();
lsmHarness = lsmInitialState.getLSMHarness();
searchCallback = lsmInitialState.getSearchOperationCallback();
- predicate = (RangePredicate) lsmInitialState.getSearchPredicate();
+ RangePredicate predicate = (RangePredicate) lsmInitialState.getSearchPredicate();
reusablePred.setLowKeyComparator(cmp);
reusablePred.setHighKey(predicate.getHighKey(), predicate.isHighKeyInclusive());
reusablePred.setHighKeyComparator(predicate.getHighKeyComparator());
@@ -237,8 +362,7 @@
}
if (btreeAccessors[i] == null) {
- btreeAccessors[i] =
- btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
} else {
// re-use
btreeAccessors[i].reset(btree, NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
index 2d2d184..f619a52 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBTreeWithBuddyAbstractCursor.java
@@ -29,6 +29,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType;
@@ -125,10 +126,8 @@
IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState.getBTreeLeafFrameFactory().createFrame();
if (btreeAccessors[i] == null) {
btreeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
- btreeAccessors[i] =
- btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
- buddyBtreeAccessors[i] =
- buddyBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
+ buddyBtreeAccessors[i] = buddyBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
} else {
btreeCursors[i].reset();
btreeAccessors[i].reset(btree, NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
index 061cad5..b2f5327 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/impls/LSMBuddyBTreeMergeCursor.java
@@ -24,7 +24,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMIndexSearchCursor;
@@ -63,8 +63,7 @@
IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState.getBuddyBTreeLeafFrameFactory().createFrame();
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
BTree buddyBtree = ((LSMBTreeWithBuddyDiskComponent) component).getBuddyIndex();
- btreeAccessors[i] =
- buddyBtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = buddyBtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
btreeAccessors[i].search(rangeCursors[i], btreePredicate);
}
setPriorityQueueComparator();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/utils/LSMBTreeUtil.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/utils/LSMBTreeUtil.java
index a0b1905..08e5af0 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/utils/LSMBTreeUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-btree/src/main/java/org/apache/hyracks/storage/am/lsm/btree/utils/LSMBTreeUtil.java
@@ -132,7 +132,7 @@
int[] bloomFilterKeyFields, double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy,
ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
ILSMIOOperationCallbackFactory ioOpCallbackFactory, boolean durable,
- IMetadataPageManagerFactory freePageManagerFactory) {
+ IMetadataPageManagerFactory freePageManagerFactory, ITracer tracer) {
LSMBTreeTupleWriterFactory insertTupleWriterFactory =
new LSMBTreeTupleWriterFactory(typeTraits, cmpFactories.length, false, false);
LSMBTreeTupleWriterFactory deleteTupleWriterFactory =
@@ -176,14 +176,15 @@
return new ExternalBTree(ioManager, interiorFrameFactory, insertLeafFrameFactory, deleteLeafFrameFactory,
diskBufferCache, fileNameManager, componentFactory, bulkLoadComponentFactory,
transactionComponentFactory, bloomFilterFalsePositiveRate, cmpFactories, mergePolicy, opTracker,
- ioScheduler, ioOpCallbackFactory, durable);
+ ioScheduler, ioOpCallbackFactory, durable, tracer);
}
public static ExternalBTreeWithBuddy createExternalBTreeWithBuddy(IIOManager ioManager, FileReference file,
IBufferCache diskBufferCache, ITypeTraits[] typeTraits, IBinaryComparatorFactory[] cmpFactories,
double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker,
ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallbackFactory ioOpCallbackFactory,
- int[] buddyBTreeFields, boolean durable, IMetadataPageManagerFactory freePageManagerFactory) {
+ int[] buddyBTreeFields, boolean durable, IMetadataPageManagerFactory freePageManagerFactory,
+ ITracer tracer) {
ITypeTraits[] buddyBtreeTypeTraits = new ITypeTraits[buddyBTreeFields.length];
IBinaryComparatorFactory[] buddyBtreeCmpFactories = new IBinaryComparatorFactory[buddyBTreeFields.length];
for (int i = 0; i < buddyBtreeTypeTraits.length; i++) {
@@ -232,6 +233,6 @@
return new ExternalBTreeWithBuddy(ioManager, interiorFrameFactory, insertLeafFrameFactory,
buddyBtreeLeafFrameFactory, diskBufferCache, fileNameManager, componentFactory,
bulkLoadComponentFactory, bloomFilterFalsePositiveRate, mergePolicy, opTracker, ioScheduler,
- ioOpCallbackFactory, cmpFactories, buddyBtreeCmpFactories, buddyBTreeFields, durable);
+ ioOpCallbackFactory, cmpFactories, buddyBtreeCmpFactories, buddyBTreeFields, durable, tracer);
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponent.java
index a60f544..fc55ce5 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponent.java
@@ -127,4 +127,16 @@
* @return index data structure that is the stored in the component
*/
IIndex getIndex();
+
+ /**
+ * @return the {@link ILSMIndex} this component belong to
+ */
+ ILSMIndex getLsmIndex();
+
+ /**
+ *
+ * @return id of the component
+ * @throws HyracksDataException
+ */
+ ILSMComponentId getId() throws HyracksDataException;
}
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.update.aql b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentId.java
similarity index 62%
rename from asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.update.aql
rename to hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentId.java
index 913be14..5662862 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.4.update.aql
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentId.java
@@ -16,21 +16,26 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
+package org.apache.hyracks.storage.am.lsm.common.api;
+
+/**
+ * Stores the id of the disk component, which is a interval (minId, maxId).
+ * It is generated by {@link ILSMComponentIdGenerator}
+ *
*/
-
-use dataverse test;
-
-insert into dataset MyMiniData
-(
- for $m in dataset('MyData')
- return {
- "id": $m.id,
- "point": $m.point
+public interface ILSMComponentId {
+ public enum IdCompareResult {
+ UNKNOWN,
+ LESS_THAN,
+ GREATER_THAN,
+ INTERSECT,
+ INCLUDE
}
-);
+ /**
+ * @return whether the id is missing
+ */
+ boolean missing();
+
+ IdCompareResult compareTo(ILSMComponentId id);
+}
diff --git a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.2.ddl.aql b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentIdGenerator.java
similarity index 62%
rename from asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.2.ddl.aql
rename to hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentIdGenerator.java
index 3bcfdde..5dd3061 100644
--- a/asterixdb/asterix-installer/src/test/resources/transactionts/queries/recovery_ddl/temp_secondary_index_recovery/secondary_index_recovery.2.ddl.aql
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentIdGenerator.java
@@ -16,24 +16,22 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Test case Name : dataverse_recovery
- * Description :
- * Expected Result :
- * Date :
+package org.apache.hyracks.storage.am.lsm.common.api;
+
+/**
+ * This interface generates component Ids for LSM components (both memory and disk components).
*/
+public interface ILSMComponentIdGenerator {
-drop dataverse SampleDV if exists;
-create dataverse SampleDV;
+ /**
+ * @return An Id for LSM component
+ */
+ public ILSMComponentId getId();
-use dataverse SampleDV;
+ /**
+ * Refresh the component Id generator to generate the next Id.
+ * {@link #getId()} would always return the same Id before this method is called.
+ */
+ public void refresh();
-create type SampleType as open {
- id: int32,
- text: string
}
-
-create temporary dataset SampleDS(SampleType)
-primary key id;
-
-create index SampleDSix on SampleDS(text);
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentIdGeneratorFactory.java
similarity index 70%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
copy to hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentIdGeneratorFactory.java
index 7a17743..c0f530b 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries/temp-dataset/drop-index/drop-index.4.query.aql
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMComponentIdGeneratorFactory.java
@@ -16,15 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Drop secondary indexes for a temporary dataset.
- * Expected Result : Success
- * Date : 27th March 2015
- *
- */
+package org.apache.hyracks.storage.am.lsm.common.api;
-use dataverse test;
+import java.io.Serializable;
-for $a in dataset('t1')
-where $a.unique1 > 10 and $a.stringu1="DGAAAAXXXXXXXXXXXXXXXXXXX"
-return $a
+import org.apache.hyracks.api.application.INCServiceContext;
+
+@FunctionalInterface
+public interface ILSMComponentIdGeneratorFactory extends Serializable {
+
+ ILSMComponentIdGenerator getComponentIdGenerator(INCServiceContext serviceCtx);
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponent.java
index 43c5482..bd2bb45 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponent.java
@@ -48,14 +48,6 @@
int getFileReferenceCount();
/**
- * Return the component Id of this disk component from its metadata
- *
- * @return
- * @throws HyracksDataException
- */
- ILSMDiskComponentId getComponentId() throws HyracksDataException;
-
- /**
* @return LsmIndex of the component
*/
AbstractLSMIndex getLsmIndex();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponentId.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponentId.java
deleted file mode 100644
index 5d38ace..0000000
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMDiskComponentId.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.hyracks.storage.am.lsm.common.api;
-
-import org.apache.hyracks.storage.am.common.freepage.MutableArrayValueReference;
-
-/**
- * Stores the id of the disk component, which is a interval (minId, maxId).
- * When a disk component is formed by the flush operation, its initial minId and maxId are the same, and
- * currently are set as the flush LSN.
- * When a disk component is formed by the merge operation, its [minId, maxId] is set as the union of
- * all ids of merged disk components.
- *
- * @author luochen
- *
- */
-public interface ILSMDiskComponentId {
-
- public static final long NOT_FOUND = -1;
-
- public static final MutableArrayValueReference COMPONENT_ID_MIN_KEY =
- new MutableArrayValueReference("Component_Id_Min".getBytes());
-
- public static final MutableArrayValueReference COMPONENT_ID_MAX_KEY =
- new MutableArrayValueReference("Component_Id_Max".getBytes());
-
- long getMinId();
-
- long getMaxId();
-
- default boolean notFound() {
- return getMinId() == NOT_FOUND || getMaxId() == NOT_FOUND;
- }
-
-}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMHarness.java
index 89c8cb9..b32dd0f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMHarness.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMHarness.java
@@ -253,4 +253,17 @@
*/
void deleteComponents(ILSMIndexOperationContext ctx, Predicate<ILSMComponent> predicate)
throws HyracksDataException;
+
+ /**
+ * Replace the memory components in this operation context with their corresponding disk
+ * components if possible
+ *
+ * @param ctx
+ * the operation context
+ * @param startIndex
+ * the index of the first component to switch
+ * @throws HyracksDataException
+ */
+ void replaceMemoryComponentsWithDiskComponents(ILSMIndexOperationContext ctx, int startIndex)
+ throws HyracksDataException;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperation.java
index c2ae786..ff32628 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperation.java
@@ -29,9 +29,10 @@
/**
* Represents the io operation type
*/
- enum LSMIOOpertionType {
+ enum LSMIOOperationType {
FLUSH,
- MERGE
+ MERGE,
+ LOAD
}
/**
@@ -52,7 +53,7 @@
/**
* @return the operation type
*/
- LSMIOOpertionType getIOOpertionType();
+ LSMIOOperationType getIOOpertionType();
@Override
Boolean call() throws HyracksDataException;
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallback.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallback.java
index 0323026..e122fd4 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallback.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallback.java
@@ -21,6 +21,7 @@
import java.util.List;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
public interface ILSMIOOperationCallback {
@@ -29,7 +30,7 @@
* (i.e. IO operations could be flush or merge operations.)
* For flush, this is called immediately before switching the current memory component pointer
*/
- void beforeOperation(LSMOperationType opType) throws HyracksDataException;
+ void beforeOperation(LSMIOOperationType opType) throws HyracksDataException;
/**
* This method is called on an IO operation sometime after the operation was completed.
@@ -42,7 +43,7 @@
* @param newComponent
* @throws HyracksDataException
*/
- void afterOperation(LSMOperationType opType, List<ILSMComponent> oldComponents, ILSMDiskComponent newComponent)
+ void afterOperation(LSMIOOperationType opType, List<ILSMComponent> oldComponents, ILSMDiskComponent newComponent)
throws HyracksDataException;
/**
@@ -53,7 +54,7 @@
* @param newComponent
* @throws HyracksDataException
*/
- void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent) throws HyracksDataException;
+ void afterFinalize(LSMIOOperationType opType, ILSMDiskComponent newComponent) throws HyracksDataException;
/**
* This method is called when a memory component is recycled
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallbackFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallbackFactory.java
index b291f7c..a9dc50e 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallbackFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIOOperationCallbackFactory.java
@@ -20,7 +20,15 @@
import java.io.Serializable;
-@FunctionalInterface
+import org.apache.hyracks.api.application.INCServiceContext;
+
public interface ILSMIOOperationCallbackFactory extends Serializable {
+ /**
+ * Initialize the callback factory with the given ncCtx
+ *
+ * @param ncCtx
+ */
+ void initialize(INCServiceContext ncCtx);
+
ILSMIOOperationCallback createIoOpCallback(ILSMIndex index);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndex.java
index 0f48621..62493f4 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndex.java
@@ -27,9 +27,8 @@
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMHarness;
import org.apache.hyracks.storage.common.IIndex;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexCursor;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
/**
@@ -45,8 +44,7 @@
void deactivate(boolean flush) throws HyracksDataException;
@Override
- ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException;
+ ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) throws HyracksDataException;
ILSMOperationTracker getOperationTracker();
@@ -145,4 +143,9 @@
* @return The number of all memory components (active and inactive)
*/
int getNumberOfAllMemoryComponents();
+
+ /**
+ * @return the {@link ILSMHarness} of the index
+ */
+ ILSMHarness getHarness();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexOperationContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexOperationContext.java
index 5b0378a..ec9124d 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexOperationContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMIndexOperationContext.java
@@ -56,4 +56,30 @@
PermutingTupleReference getFilterTuple();
MultiComparator getFilterCmp();
+
+ /**
+ * @return the {@link ILSMIndex} of the component
+ */
+ ILSMIndex getIndex();
+
+ /**
+ * Performance tracing method. Logs the accumulated counters for number of tuples
+ *
+ * @param tupleCount
+ * the number of tuples represented by the counters
+ */
+ void logPerformanceCounters(int tupleCount);
+
+ /**
+ * Increment the time taken for entering and exiting components
+ *
+ * @param increment
+ * the time increment in nanoseconds
+ */
+ void incrementEnterExitTime(long increment);
+
+ /**
+ * @return true if performance tracing is enabled, false otherwise
+ */
+ boolean isTracingEnabled();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMMemoryComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMMemoryComponent.java
index 13543e4..f892585 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMMemoryComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/api/ILSMMemoryComponent.java
@@ -101,4 +101,12 @@
* @return the size of the memory component
*/
long getSize();
+
+ /**
+ * Reset the component Id of the memory component after it's recycled
+ *
+ * @param newId
+ * @throws HyracksDataException
+ */
+ void resetId(ILSMComponentId newId) throws HyracksDataException;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
index 2860a8f..4e8cf71 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/dataflow/LSMIndexCompactOperatorNodePushable.java
@@ -25,7 +25,7 @@
import org.apache.hyracks.dataflow.std.base.AbstractOperatorNodePushable;
import org.apache.hyracks.storage.am.common.api.IIndexDataflowHelper;
import org.apache.hyracks.storage.am.common.dataflow.IIndexDataflowHelperFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
@@ -56,8 +56,7 @@
public void initialize() throws HyracksDataException {
indexHelper.open();
ILSMIndex index = (ILSMIndex) indexHelper.getIndexInstance();
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleFullMerge(index.getIOOperationCallback());
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMComponent.java
index ac124ba..84d2fe5 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMComponent.java
@@ -28,7 +28,7 @@
protected final ILSMComponentFilter filter;
protected final AbstractLSMIndex lsmIndex;
// Mutables
- protected ComponentState state;
+ protected volatile ComponentState state;
protected int readerCount;
public AbstractLSMComponent(AbstractLSMIndex lsmIndex, ILSMComponentFilter filter) {
@@ -46,4 +46,9 @@
public ILSMComponentFilter getLSMComponentFilter() {
return filter;
}
+
+ @Override
+ public final AbstractLSMIndex getLsmIndex() {
+ return lsmIndex;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
index a0d1c23..bb27236 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMDiskComponent.java
@@ -18,19 +18,30 @@
*/
package org.apache.hyracks.storage.am.lsm.common.impls;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.api.IMetadataPageManager;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.util.ComponentUtils;
+import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
import org.apache.hyracks.storage.common.MultiComparator;
public abstract class AbstractLSMDiskComponent extends AbstractLSMComponent implements ILSMDiskComponent {
+ private static final Logger LOGGER = Logger.getLogger(AbstractLSMDiskComponent.class.getName());
+
private final DiskComponentMetadata metadata;
+ // a variable cache of componentId stored in metadata.
+ // since componentId is immutable, we do not want to read from metadata every time the componentId
+ // is requested.
+ private ILSMComponentId componentId;
+
public AbstractLSMDiskComponent(AbstractLSMIndex lsmIndex, IMetadataPageManager mdPageManager,
ILSMComponentFilter filter) {
super(lsmIndex, filter);
@@ -39,11 +50,6 @@
}
@Override
- public AbstractLSMIndex getLsmIndex() {
- return lsmIndex;
- }
-
- @Override
public boolean threadEnter(LSMOperationType opType, boolean isMutableComponent) {
if (state == ComponentState.INACTIVE) {
throw new IllegalStateException("Trying to enter an inactive disk component");
@@ -109,13 +115,23 @@
}
@Override
- public ILSMDiskComponentId getComponentId() throws HyracksDataException {
- long minID = ComponentUtils.getLong(metadata, ILSMDiskComponentId.COMPONENT_ID_MIN_KEY,
- ILSMDiskComponentId.NOT_FOUND);
- long maxID = ComponentUtils.getLong(metadata, ILSMDiskComponentId.COMPONENT_ID_MAX_KEY,
- ILSMDiskComponentId.NOT_FOUND);
- //TODO: do we need to throw an exception when ID is not found?
- return new LSMDiskComponentId(minID, maxID);
+ public ILSMComponentId getId() throws HyracksDataException {
+ if (componentId != null) {
+ return componentId;
+ }
+ synchronized (this) {
+ if (componentId == null) {
+ componentId = LSMComponentIdUtils.readFrom(metadata);
+ }
+ }
+ if (componentId.missing()) {
+ // For normal datasets, componentId shouldn't be missing, since otherwise it'll be a bug.
+ // However, we cannot throw an exception here to be compatible with legacy datasets.
+ // In this case, the disk component would always get a garbage Id [-1, -1], which makes the
+ // component Id-based optimization useless but still correct.
+ LOGGER.warning("Component Id not found from disk component metadata");
+ }
+ return componentId;
}
/**
@@ -128,6 +144,9 @@
@Override
public void markAsValid(boolean persist) throws HyracksDataException {
ComponentUtils.markAsValid(getMetadataHolder(), persist);
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.log(Level.INFO, "Marked as valid component with id: " + getId());
+ }
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
index dd3a5de..dc808ad 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndex.java
@@ -27,6 +27,8 @@
import java.util.Set;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.exceptions.ErrorCode;
@@ -37,16 +39,20 @@
import org.apache.hyracks.api.replication.IReplicationJob.ReplicationOperation;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.common.impls.AbstractSearchPredicate;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentFilterHelper;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.ComponentState;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilterFrameFactory;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId.IdCompareResult;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
@@ -67,6 +73,7 @@
import org.apache.hyracks.util.trace.ITracer;
public abstract class AbstractLSMIndex implements ILSMIndex {
+ private static final Logger LOGGER = Logger.getLogger(AbstractLSMIndex.class.getName());
protected final ILSMHarness lsmHarness;
protected final IIOManager ioManager;
protected final ILSMIOOperationScheduler ioScheduler;
@@ -138,7 +145,7 @@
double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker,
ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallbackFactory ioOpCallbackFactory,
ILSMDiskComponentFactory componentFactory, ILSMDiskComponentFactory bulkLoadComponentFactory,
- boolean durable) {
+ boolean durable, ITracer tracer) {
this.ioManager = ioManager;
this.diskBufferCache = diskBufferCache;
this.fileManager = fileManager;
@@ -148,6 +155,7 @@
this.componentFactory = componentFactory;
this.bulkLoadComponentFactory = bulkLoadComponentFactory;
this.durable = durable;
+ this.tracer = tracer;
lsmHarness = new ExternalIndexHarness(this, mergePolicy, opTracker, diskBufferCache.isReplicationEnabled());
isActive = false;
diskComponents = new LinkedList<>();
@@ -214,7 +222,7 @@
protected void flushMemoryComponent() throws HyracksDataException {
BlockingIOOperationCallbackWrapper cb = new BlockingIOOperationCallbackWrapper(ioOpCallback);
- ILSMIndexAccessor accessor = createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleFlush(cb);
try {
cb.waitForIO();
@@ -299,12 +307,12 @@
operationalComponents.add(memoryComponents.get(cmc));
break;
case INSERT:
- addOperationalMutableComponents(operationalComponents);
+ addOperationalMutableComponents(operationalComponents, true);
operationalComponents.addAll(immutableComponents);
break;
case SEARCH:
if (memoryComponentsAllocated) {
- addOperationalMutableComponents(operationalComponents);
+ addOperationalMutableComponents(operationalComponents, false);
}
if (filterManager != null) {
for (ILSMComponent c : immutableComponents) {
@@ -371,18 +379,23 @@
ioScheduler.scheduleOperation(TracedIOOperation.wrap(mergeOp, tracer));
}
- private void addOperationalMutableComponents(List<ILSMComponent> operationalComponents) {
+ private void addOperationalMutableComponents(List<ILSMComponent> operationalComponents, boolean modification) {
int cmc = currentMutableComponentId.get();
int numMutableComponents = memoryComponents.size();
for (int i = 0; i < numMutableComponents - 1; i++) {
ILSMMemoryComponent c = memoryComponents.get((cmc + i + 1) % numMutableComponents);
if (c.isReadable()) {
- // Make sure newest components are added first
+ // Make sure newest components are added first if readable
operationalComponents.add(0, c);
}
}
- // The current mutable component is always added
- operationalComponents.add(0, memoryComponents.get(cmc));
+ // The current mutable component is added if modification operation or if readable
+ // This ensures that activation of new component only happens in case of modifications
+ // and allow for controlling that without stopping search operations
+ ILSMMemoryComponent c = memoryComponents.get(cmc);
+ if (modification || c.isReadable()) {
+ operationalComponents.add(0, c);
+ }
}
@Override
@@ -396,6 +409,7 @@
public IIndexBulkLoader createBulkLoader(float fillLevel, boolean verifyInput, long numElementsHint)
throws HyracksDataException {
+ ioOpCallback.beforeOperation(LSMIOOperationType.LOAD);
return new LSMIndexDiskComponentBulkLoader(this, fillLevel, verifyInput, numElementsHint);
}
@@ -416,7 +430,7 @@
}
@Override
- public final synchronized void allocateMemoryComponents() throws HyracksDataException {
+ public synchronized void allocateMemoryComponents() throws HyracksDataException {
if (!isActive) {
throw HyracksDataException.create(ErrorCode.CANNOT_ALLOCATE_MEMORY_FOR_INACTIVE_INDEX);
}
@@ -435,6 +449,7 @@
if (c != EmptyComponent.INSTANCE) {
diskComponents.add(0, c);
}
+ assert checkComponentIds();
}
@Override
@@ -445,6 +460,25 @@
if (newComponent != EmptyComponent.INSTANCE) {
diskComponents.add(swapIndex, newComponent);
}
+ assert checkComponentIds();
+ }
+
+ /**
+ * A helper method to ensure disk components have proper Ids (non-decreasing)
+ * We may get rid of this method once component Id is stablized
+ *
+ * @throws HyracksDataException
+ */
+ private boolean checkComponentIds() throws HyracksDataException {
+ for (int i = 0; i < diskComponents.size() - 1; i++) {
+ ILSMComponentId id1 = diskComponents.get(i).getId();
+ ILSMComponentId id2 = diskComponents.get(i + 1).getId();
+ IdCompareResult cmp = id1.compareTo(id2);
+ if (cmp != IdCompareResult.UNKNOWN && cmp != IdCompareResult.GREATER_THAN) {
+ return false;
+ }
+ }
+ return true;
}
@Override
@@ -627,7 +661,8 @@
return filterManager;
}
- public ILSMHarness getLsmHarness() {
+ @Override
+ public ILSMHarness getHarness() {
return lsmHarness;
}
@@ -656,8 +691,15 @@
public final ILSMDiskComponent flush(ILSMIOOperation operation) throws HyracksDataException {
ILSMIndexAccessor accessor = operation.getAccessor();
ILSMIndexOperationContext opCtx = accessor.getOpContext();
- return opCtx.getOperation() == IndexOperation.DELETE_MEMORY_COMPONENT ? EmptyComponent.INSTANCE
- : doFlush(operation);
+ if (opCtx.getOperation() == IndexOperation.DELETE_MEMORY_COMPONENT) {
+ return EmptyComponent.INSTANCE;
+ } else {
+ if (LOGGER.isLoggable(Level.INFO)) {
+ FlushOperation flushOp = (FlushOperation) operation;
+ LOGGER.log(Level.INFO, "Flushing component with id: " + flushOp.getFlushingComponent().getId());
+ }
+ return doFlush(operation);
+ }
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexOperationContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexOperationContext.java
index 065d465..0818b08 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexOperationContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMIndexOperationContext.java
@@ -27,14 +27,18 @@
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.hyracks.util.trace.ITracer;
+import org.apache.hyracks.util.trace.ITracer.Scope;
public abstract class AbstractLSMIndexOperationContext implements ILSMIndexOperationContext {
+ protected final ILSMIndex index;
protected final PermutingTupleReference indexTuple;
protected final MultiComparator filterCmp;
protected final PermutingTupleReference filterTuple;
@@ -47,10 +51,14 @@
protected IndexOperation op;
protected boolean accessingComponents = false;
protected ISearchPredicate searchPredicate;
+ protected final ITracer tracer;
+ protected final long traceCategory;
+ private long enterExitTime = 0L;
- public AbstractLSMIndexOperationContext(int[] treeFields, int[] filterFields,
+ public AbstractLSMIndexOperationContext(ILSMIndex index, int[] treeFields, int[] filterFields,
IBinaryComparatorFactory[] filterCmpFactories, ISearchOperationCallback searchCallback,
- IModificationOperationCallback modificationCallback) {
+ IModificationOperationCallback modificationCallback, ITracer tracer) {
+ this.index = index;
this.searchCallback = searchCallback;
this.modificationCallback = modificationCallback;
this.componentHolder = new LinkedList<>();
@@ -73,6 +81,8 @@
filterTuple = null;
allFields = null;
}
+ this.tracer = tracer;
+ this.traceCategory = tracer.getRegistry().get("op-ctx");
}
@Override
@@ -153,4 +163,32 @@
public ISearchPredicate getSearchPredicate() {
return searchPredicate;
}
+
+ @Override
+ public final boolean isTracingEnabled() {
+ return tracer.isEnabled(traceCategory);
+ }
+
+ @Override
+ public void logPerformanceCounters(int tupleCount) {
+ if (isTracingEnabled()) {
+ tracer.instant("store-counters", traceCategory, Scope.t,
+ "{\"count\":" + tupleCount + ",\"enter-exit-duration-ns\":" + enterExitTime + "}");
+ resetCounters();
+ }
+ }
+
+ public void resetCounters() {
+ enterExitTime = 0L;
+ }
+
+ @Override
+ public void incrementEnterExitTime(long increment) {
+ enterExitTime += increment;
+ }
+
+ @Override
+ public ILSMIndex getIndex() {
+ return index;
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
index b7c3350..17dadcb 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AbstractLSMMemoryComponent.java
@@ -19,21 +19,28 @@
package org.apache.hyracks.storage.am.lsm.common.impls;
import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId.IdCompareResult;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
import org.apache.hyracks.storage.am.lsm.common.api.IVirtualBufferCache;
import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.am.lsm.common.util.LSMComponentIdUtils;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public abstract class AbstractLSMMemoryComponent extends AbstractLSMComponent implements ILSMMemoryComponent {
+ private static final Logger LOGGER = Logger.getLogger(AbstractLSMMemoryComponent.class.getName());
private final IVirtualBufferCache vbc;
private final AtomicBoolean isModified;
private int writerCount;
private boolean requestedToBeActive;
private final MemoryComponentMetadata metadata;
+ private ILSMComponentId componentId;
public AbstractLSMMemoryComponent(AbstractLSMIndex lsmIndex, IVirtualBufferCache vbc, boolean isActive,
ILSMComponentFilter filter) {
@@ -247,6 +254,7 @@
protected void doDeallocate() throws HyracksDataException {
getIndex().deactivate();
getIndex().destroy();
+ componentId = null;
}
@Override
@@ -259,4 +267,23 @@
IBufferCache virtualBufferCache = getIndex().getBufferCache();
return virtualBufferCache.getPageBudget() * (long) virtualBufferCache.getPageSize();
}
+
+ @Override
+ public ILSMComponentId getId() {
+ return componentId;
+ }
+
+ @Override
+ public void resetId(ILSMComponentId componentId) throws HyracksDataException {
+ if (this.componentId != null && !componentId.missing() // for backward compatibility
+ && this.componentId.compareTo(componentId) != IdCompareResult.LESS_THAN) {
+ throw new IllegalStateException(
+ "LSM memory component receives illegal id. Old id " + this.componentId + ", new id " + componentId);
+ }
+ if (LOGGER.isLoggable(Level.INFO)) {
+ LOGGER.log(Level.INFO, "Component Id was reset from " + this.componentId + " to " + componentId);
+ }
+ this.componentId = componentId;
+ LSMComponentIdUtils.persist(this.componentId, metadata);
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AsynchronousScheduler.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AsynchronousScheduler.java
index 438bb0b..a439ace 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AsynchronousScheduler.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/AsynchronousScheduler.java
@@ -31,7 +31,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOpertionType;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
public class AsynchronousScheduler implements ILSMIOOperationScheduler {
@@ -60,7 +60,7 @@
super.afterExecute(r, t);
LSMIOOperationTask<Boolean> task = (LSMIOOperationTask<Boolean>) r;
ILSMIOOperation executedOp = task.getOperation();
- if (executedOp.getIOOpertionType() == LSMIOOpertionType.FLUSH) {
+ if (executedOp.getIOOpertionType() == LSMIOOperationType.FLUSH) {
String id = executedOp.getIndexIdentifier();
synchronized (this) {
runningFlushOperations.remove(id);
@@ -84,9 +84,9 @@
@Override
public void scheduleOperation(ILSMIOOperation operation) throws HyracksDataException {
- if (operation.getIOOpertionType() == LSMIOOpertionType.MERGE) {
+ if (operation.getIOOpertionType() == LSMIOOperationType.MERGE) {
executor.submit(operation);
- } else if (operation.getIOOpertionType() == LSMIOOpertionType.FLUSH) {
+ } else if (operation.getIOOpertionType() == LSMIOOperationType.FLUSH) {
String id = operation.getIndexIdentifier();
synchronized (executor) {
if (runningFlushOperations.containsKey(id)) {
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BlockingIOOperationCallbackWrapper.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BlockingIOOperationCallbackWrapper.java
index 8d0395f..12dbb46 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BlockingIOOperationCallbackWrapper.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BlockingIOOperationCallbackWrapper.java
@@ -23,9 +23,9 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
public class BlockingIOOperationCallbackWrapper implements ILSMIOOperationCallback {
@@ -45,18 +45,18 @@
}
@Override
- public void beforeOperation(LSMOperationType opType) throws HyracksDataException {
+ public void beforeOperation(LSMIOOperationType opType) throws HyracksDataException {
wrappedCallback.beforeOperation(opType);
}
@Override
- public void afterOperation(LSMOperationType opType, List<ILSMComponent> oldComponents,
+ public void afterOperation(LSMIOOperationType opType, List<ILSMComponent> oldComponents,
ILSMDiskComponent newComponent) throws HyracksDataException {
wrappedCallback.afterOperation(opType, oldComponents, newComponent);
}
@Override
- public synchronized void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent)
+ public synchronized void afterFinalize(LSMIOOperationType opType, ILSMDiskComponent newComponent)
throws HyracksDataException {
wrappedCallback.afterFinalize(opType, newComponent);
notifyAll();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BloomFilterBulkLoader.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BloomFilterBulkLoader.java
index 0dcf349..29ca388 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BloomFilterBulkLoader.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/BloomFilterBulkLoader.java
@@ -26,12 +26,12 @@
private final IIndexBulkLoader bulkLoader;
+ private boolean endedBloomFilterLoad = false;
+
public BloomFilterBulkLoader(IIndexBulkLoader bulkLoader) {
this.bulkLoader = bulkLoader;
}
- private boolean endedBloomFilterLoad = false;
-
@Override
public ITupleReference add(ITupleReference tuple) throws HyracksDataException {
bulkLoader.add(tuple);
@@ -40,7 +40,8 @@
@Override
public ITupleReference delete(ITupleReference tuple) throws HyracksDataException {
- //Noop
+ // this ensure deleted keys are also added to the bulkloader
+ bulkLoader.add(tuple);
return tuple;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java
new file mode 100644
index 0000000..98c1560
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ComponentReplacementContext.java
@@ -0,0 +1,215 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.storage.am.lsm.common.impls;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
+import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
+import org.apache.hyracks.storage.common.IModificationOperationCallback;
+import org.apache.hyracks.storage.common.ISearchOperationCallback;
+import org.apache.hyracks.storage.common.ISearchPredicate;
+import org.apache.hyracks.storage.common.MultiComparator;
+
+public class ComponentReplacementContext implements ILSMIndexOperationContext {
+ private static final Logger LOGGER = Logger.getLogger(ComponentReplacementContext.class.getName());
+ private final List<ILSMComponent> components;
+ private final List<ILSMComponent> diskComponents;
+ private final List<ILSMComponentId> replacedComponentIds;
+ private final int[] swapIndexes;
+ private int count = 0;
+ boolean accessingComponent = true;
+
+ public ComponentReplacementContext(ILSMIndex lsmIndex) {
+ components = new ArrayList<>(lsmIndex.getNumberOfAllMemoryComponents());
+ replacedComponentIds = new ArrayList<>(lsmIndex.getNumberOfAllMemoryComponents());
+ swapIndexes = new int[lsmIndex.getNumberOfAllMemoryComponents()];
+ diskComponents = new ArrayList<>(lsmIndex.getNumberOfAllMemoryComponents());
+ }
+
+ @Override
+ public void setOperation(IndexOperation newOp) throws HyracksDataException {
+ // Do nothing
+ }
+
+ @Override
+ public IndexOperation getOperation() {
+ return IndexOperation.SEARCH;
+ }
+
+ @Override
+ public void reset() {
+ accessingComponent = true;
+ components.clear();
+ diskComponents.clear();
+ replacedComponentIds.clear();
+ count = 0;
+ }
+
+ @Override
+ public List<ILSMComponent> getComponentHolder() {
+ return components;
+ }
+
+ @Override
+ public List<ILSMDiskComponent> getComponentsToBeMerged() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public ISearchOperationCallback getSearchOperationCallback() {
+ return null;
+ }
+
+ @Override
+ public IModificationOperationCallback getModificationCallback() {
+ return null;
+ }
+
+ @Override
+ public void setCurrentMutableComponentId(int currentMutableComponentId) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void setSearchPredicate(ISearchPredicate searchPredicate) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public ISearchPredicate getSearchPredicate() {
+ return null;
+ }
+
+ @Override
+ public List<ILSMDiskComponent> getComponentsToBeReplicated() {
+ return Collections.emptyList();
+ }
+
+ @Override
+ public boolean isAccessingComponents() {
+ return accessingComponent;
+ }
+
+ @Override
+ public void setAccessingComponents(boolean accessingComponents) {
+ // Ignore since this is only used for component replacement
+ }
+
+ @Override
+ public PermutingTupleReference getIndexTuple() {
+ return null;
+ }
+
+ @Override
+ public PermutingTupleReference getFilterTuple() {
+ return null;
+ }
+
+ @Override
+ public MultiComparator getFilterCmp() {
+ return null;
+ }
+
+ @Override
+ public void logPerformanceCounters(int tupleCount) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void incrementEnterExitTime(long increment) {
+ // Ignore since this is only used for component replacement
+ }
+
+ public boolean proceed(List<ILSMDiskComponent> allDiskComponents) throws HyracksDataException {
+ for (int i = 0; i < components.size(); i++) {
+ replacedComponentIds.add(components.get(i).getId());
+ // ensure that disk component exists
+ boolean found = false;
+ LOGGER.log(Level.INFO, "Looking for a component with the id: " + replacedComponentIds.get(i));
+ for (int j = 0; j < allDiskComponents.size(); j++) {
+ ILSMDiskComponent dc = allDiskComponents.get(j);
+ ILSMComponentId diskComponentId = dc.getId();
+ LOGGER.log(Level.INFO, "Next disk component id: " + diskComponentId);
+ if (diskComponentId.equals(replacedComponentIds.get(i))) {
+ found = true;
+ diskComponents.add(dc);
+ break;
+ }
+ }
+ if (!found) {
+ // component has been merged?
+ LOGGER.log(Level.WARNING, "Memory Component with id = " + replacedComponentIds.get(i)
+ + " was flushed and merged before search cursor replaces it");
+ return false;
+ }
+ }
+ return true;
+ }
+
+ public void swapIndex(int i) {
+ swapIndexes[count] = i;
+ count++;
+ }
+
+ public void prepareToEnter() {
+ components.clear();
+ components.addAll(diskComponents);
+ accessingComponent = false;
+ }
+
+ public void replace(ILSMIndexOperationContext ctx) {
+ // Called after exit and enter has been completed
+ try {
+ for (int i = 0; i < count; i++) {
+ ILSMComponent removed = ctx.getComponentHolder().remove(swapIndexes[i]);
+ if (removed.getType() == LSMComponentType.MEMORY) {
+ LOGGER.log(Level.INFO, "Removed a memory component from the search operation");
+ } else {
+ throw new IllegalStateException("Disk components can't be removed from the search operation");
+ }
+ ctx.getComponentHolder().add(swapIndexes[i], diskComponents.get(i));
+ }
+ } catch (Exception e) {
+ LOGGER.log(Level.WARNING, "Failure replacing memory components with disk components", e);
+ throw e;
+ }
+ }
+
+ @Override
+ public ILSMIndex getIndex() {
+ return null;
+ }
+
+ @Override
+ public boolean isTracingEnabled() {
+ return false;
+ }
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ConstantMergePolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ConstantMergePolicy.java
index 847b882..13911ef 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ConstantMergePolicy.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ConstantMergePolicy.java
@@ -23,6 +23,8 @@
import java.util.Map;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.ComponentState;
@@ -30,6 +32,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
public class ConstantMergePolicy implements ILSMMergePolicy {
private int numComponents;
@@ -43,12 +46,12 @@
}
if (fullMergeIsRequested) {
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessParameters iap =
+ new IndexAccessParameters(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(iap);
accessor.scheduleFullMerge(index.getIOOperationCallback());
} else if (immutableComponents.size() >= numComponents) {
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleMerge(index.getIOOperationCallback(), immutableComponents);
}
}
@@ -104,8 +107,7 @@
if (!areComponentsMergable(immutableComponents)) {
throw new IllegalStateException();
}
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleMerge(index.getIOOperationCallback(), immutableComponents);
return true;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/EmptyComponent.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/EmptyComponent.java
index f2751bf..e3ca9f1 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/EmptyComponent.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/EmptyComponent.java
@@ -25,8 +25,8 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.common.IIndex;
@@ -83,8 +83,8 @@
}
@Override
- public ILSMDiskComponentId getComponentId() throws HyracksDataException {
- return null;
+ public ILSMComponentId getId() {
+ return LSMComponentId.MISSING_COMPONENT_ID;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
index 2f4dcc2..20f9f6a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ExternalIndexHarness.java
@@ -30,6 +30,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
@@ -106,7 +107,7 @@
// Check if there is any action that is needed to be taken based on the operation type
switch (opType) {
case MERGE:
- lsmIndex.getIOOperationCallback().beforeOperation(LSMOperationType.MERGE);
+ lsmIndex.getIOOperationCallback().beforeOperation(LSMIOOperationType.MERGE);
default:
break;
}
@@ -207,7 +208,7 @@
public void scheduleMerge(ILSMIndexOperationContext ctx, ILSMIOOperationCallback callback)
throws HyracksDataException {
if (!getAndEnterComponents(ctx, LSMOperationType.MERGE, true)) {
- callback.afterFinalize(LSMOperationType.MERGE, null);
+ callback.afterFinalize(LSMIOOperationType.MERGE, null);
return;
}
lsmIndex.scheduleMerge(ctx, callback);
@@ -220,7 +221,7 @@
if (!getAndEnterComponents(ctx, LSMOperationType.MERGE, true)) {
// If the merge cannot be scheduled because there is already an ongoing merge on subset/all of the components, then
// whenever the current merge has finished, it will schedule the full merge again.
- callback.afterFinalize(LSMOperationType.MERGE, null);
+ callback.afterFinalize(LSMIOOperationType.MERGE, null);
return;
}
fullMergeIsRequested.set(false);
@@ -236,11 +237,11 @@
ILSMDiskComponent newComponent = null;
try {
newComponent = lsmIndex.merge(operation);
- operation.getCallback().afterOperation(LSMOperationType.MERGE, ctx.getComponentHolder(), newComponent);
+ operation.getCallback().afterOperation(LSMIOOperationType.MERGE, ctx.getComponentHolder(), newComponent);
newComponent.markAsValid(lsmIndex.isDurable());
} finally {
exitComponents(ctx, LSMOperationType.MERGE, newComponent, false);
- operation.getCallback().afterFinalize(LSMOperationType.MERGE, newComponent);
+ operation.getCallback().afterFinalize(LSMIOOperationType.MERGE, newComponent);
}
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Finished the merge operation for index: " + lsmIndex);
@@ -300,7 +301,7 @@
@Override
public void scheduleFlush(ILSMIndexOperationContext ctx, ILSMIOOperationCallback callback)
throws HyracksDataException {
- callback.afterFinalize(LSMOperationType.FLUSH, null);
+ callback.afterFinalize(LSMIOOperationType.FLUSH, null);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FlushOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FlushOperation.java
index 7b7f950..e809925 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FlushOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/FlushOperation.java
@@ -60,8 +60,8 @@
}
@Override
- public LSMIOOpertionType getIOOpertionType() {
- return LSMIOOpertionType.FLUSH;
+ public LSMIOOperationType getIOOpertionType() {
+ return LSMIOOperationType.FLUSH;
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentId.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentId.java
new file mode 100644
index 0000000..442af56
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentId.java
@@ -0,0 +1,101 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hyracks.storage.am.lsm.common.impls;
+
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+
+public class LSMComponentId implements ILSMComponentId {
+
+ public static final long NOT_FOUND = -1;
+
+ // Use to handle legacy datasets which do not have the component Id
+ public static final ILSMComponentId MISSING_COMPONENT_ID = new LSMComponentId(NOT_FOUND, NOT_FOUND);
+
+ // A default component id used for bulk loaded component
+ public static final ILSMComponentId DEFAULT_COMPONENT_ID = new LSMComponentId(0, 0);
+
+ private long minId;
+
+ private long maxId;
+
+ public LSMComponentId(long minId, long maxId) {
+ assert minId <= maxId;
+ this.minId = minId;
+ this.maxId = maxId;
+ }
+
+ public void reset(long minId, long maxId) {
+ this.minId = minId;
+ this.maxId = maxId;
+ }
+
+ public long getMinId() {
+ return this.minId;
+ }
+
+ public long getMaxId() {
+ return this.maxId;
+ }
+
+ @Override
+ public boolean missing() {
+ return minId == NOT_FOUND || maxId == NOT_FOUND;
+ }
+
+ @Override
+ public String toString() {
+ return "[" + minId + "," + maxId + "]";
+ }
+
+ @Override
+ public int hashCode() {
+ return 31 * Long.hashCode(minId) + Long.hashCode(maxId);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+ if (!(obj instanceof LSMComponentId)) {
+ return false;
+ }
+ LSMComponentId other = (LSMComponentId) obj;
+ return maxId == other.maxId && minId == other.minId;
+ }
+
+ @Override
+ public IdCompareResult compareTo(ILSMComponentId id) {
+ if (this.missing() || id == null || id.missing()) {
+ return IdCompareResult.UNKNOWN;
+ }
+ LSMComponentId componentId = (LSMComponentId) id;
+ if (this.getMinId() > componentId.getMaxId()) {
+ return IdCompareResult.GREATER_THAN;
+ } else if (this.getMaxId() < componentId.getMinId()) {
+ return IdCompareResult.LESS_THAN;
+ } else if (this.getMinId() <= componentId.getMinId() && this.getMaxId() >= componentId.getMaxId()) {
+ return IdCompareResult.INCLUDE;
+ } else {
+ return IdCompareResult.INTERSECT;
+ }
+ }
+
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentIdGenerator.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentIdGenerator.java
new file mode 100644
index 0000000..e174153
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentIdGenerator.java
@@ -0,0 +1,66 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hyracks.storage.am.lsm.common.impls;
+
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
+
+/**
+ * A default implementation of {@link ILSMComponentIdGenerator}.
+ *
+ */
+public class LSMComponentIdGenerator implements ILSMComponentIdGenerator {
+
+ protected long previousTimestamp = -1L;
+
+ private ILSMComponentId componentId;
+
+ public LSMComponentIdGenerator() {
+ refresh();
+ }
+
+ @Override
+ public void refresh() {
+ long ts = getCurrentTimestamp();
+ componentId = new LSMComponentId(ts, ts);
+ }
+
+ @Override
+ public ILSMComponentId getId() {
+ return componentId;
+ }
+
+ protected long getCurrentTimestamp() {
+ long timestamp = System.currentTimeMillis();
+ while (timestamp <= previousTimestamp) {
+ // make sure timestamp is strictly increasing
+ try {
+ Thread.sleep(1);
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ timestamp = System.currentTimeMillis();
+ }
+ previousTimestamp = timestamp;
+ return timestamp;
+
+ }
+
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentIdGeneratorFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentIdGeneratorFactory.java
new file mode 100644
index 0000000..728c90a
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMComponentIdGeneratorFactory.java
@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.hyracks.storage.am.lsm.common.impls;
+
+import org.apache.hyracks.api.application.INCServiceContext;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGenerator;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentIdGeneratorFactory;
+
+/**
+ * A default implementation of {@link ILSMComponentIdGeneratorFactory}.
+ *
+ */
+public class LSMComponentIdGeneratorFactory implements ILSMComponentIdGeneratorFactory {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public ILSMComponentIdGenerator getComponentIdGenerator(INCServiceContext serviceCtx) {
+ return new LSMComponentIdGenerator();
+ }
+
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMDiskComponentId.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMDiskComponentId.java
deleted file mode 100644
index f448c84..0000000
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMDiskComponentId.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.hyracks.storage.am.lsm.common.impls;
-
-import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentId;
-
-public class LSMDiskComponentId implements ILSMDiskComponentId {
-
- private final long minId;
-
- private final long maxId;
-
- public LSMDiskComponentId(long minId, long maxId) {
- this.minId = minId;
- this.maxId = maxId;
- }
-
- @Override
- public long getMinId() {
- return this.minId;
- }
-
- @Override
- public long getMaxId() {
- return this.maxId;
- }
-
- @Override
- public String toString() {
- return "[" + minId + "," + maxId + "]";
- }
-
- @Override
- public int hashCode() {
- return 31 * Long.hashCode(minId) + Long.hashCode(maxId);
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj) {
- return true;
- }
- if (!(obj instanceof LSMDiskComponentId)) {
- return false;
- }
- LSMDiskComponentId other = (LSMDiskComponentId) obj;
- if (maxId != other.maxId) {
- return false;
- }
- if (minId != other.minId) {
- return false;
- }
- return true;
- }
-
-}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
index 00f0feb..e1d5114 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMHarness.java
@@ -34,7 +34,7 @@
import org.apache.hyracks.dataflow.common.comm.io.FrameTupleAccessor;
import org.apache.hyracks.dataflow.common.data.accessors.FrameTupleReference;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.IFrameOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.IFrameTupleProcessor;
@@ -44,6 +44,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
@@ -62,6 +63,7 @@
private static final Logger LOGGER = Logger.getLogger(LSMHarness.class.getName());
protected final ILSMIndex lsmIndex;
+ protected final ComponentReplacementContext componentReplacementCtx;
protected final ILSMMergePolicy mergePolicy;
protected final ILSMOperationTracker opTracker;
protected final AtomicBoolean fullMergeIsRequested;
@@ -83,74 +85,97 @@
if (replicationEnabled) {
this.componentsToBeReplicated = new ArrayList<>();
}
+ componentReplacementCtx = new ComponentReplacementContext(lsmIndex);
}
protected boolean getAndEnterComponents(ILSMIndexOperationContext ctx, LSMOperationType opType,
boolean isTryOperation) throws HyracksDataException {
- validateOperationEnterComponentsState(ctx);
- synchronized (opTracker) {
- while (true) {
- lsmIndex.getOperationalComponents(ctx);
- // Before entering the components, prune those corner cases that indeed should not proceed.
- switch (opType) {
- case FLUSH:
- ILSMMemoryComponent flushingComponent = (ILSMMemoryComponent) ctx.getComponentHolder().get(0);
- if (!flushingComponent.isModified()) {
- //The mutable component has not been modified by any writer. There is nothing to flush.
- //since the component is empty, set its state back to READABLE_WRITABLE
- if (flushingComponent.getState() == ComponentState.READABLE_UNWRITABLE) {
- flushingComponent.setState(ComponentState.READABLE_WRITABLE);
- opTracker.notifyAll();
+ long before = 0L;
+ if (ctx.isTracingEnabled()) {
+ before = System.nanoTime();
+ }
+ try {
+ validateOperationEnterComponentsState(ctx);
+ synchronized (opTracker) {
+ while (true) {
+ lsmIndex.getOperationalComponents(ctx);
+ // Before entering the components, prune those corner cases that indeed should not proceed.
+ switch (opType) {
+ case FLUSH:
+ // if the lsm index does not have memory components allocated, then nothing to flush
+ if (!lsmIndex.isMemoryComponentsAllocated()) {
+ return false;
}
- lsmIndex.getIOOperationCallback().recycled(flushingComponent);
- return false;
- }
- if (flushingComponent.getWriterCount() > 0) {
- /*
- * This case is a case where even though FLUSH log was flushed to disk and scheduleFlush is triggered,
- * the current in-memory component (whose state was changed to READABLE_WRITABLE (RW)
- * from READABLE_UNWRITABLE(RU) before FLUSH log was written to log tail (which is memory buffer of log file)
- * and then the state was changed back to RW (as shown in the following scenario)) can have writers
- * based on the current code base/design.
- * Thus, the writer count of the component may be greater than 0.
- * if this happens, intead of throwing exception, scheduleFlush() deal with this situation by not flushing
- * the component.
- * Please see issue 884 for more detail information:
- * https://code.google.com/p/asterixdb/issues/detail?id=884&q=owner%3Akisskys%40gmail.com&colspec=ID%20Type%20Status%20Priority%20Milestone%20Owner%20Summary%20ETA%20Severity
- *
- */
- return false;
- }
- break;
- case MERGE:
- if (ctx.getComponentHolder().size() < 2
- && ctx.getOperation() != IndexOperation.DELETE_DISK_COMPONENTS) {
- // There is only a single component. There is nothing to merge.
- return false;
- }
- break;
- default:
- break;
- }
- if (enterComponents(ctx, opType)) {
- return true;
- } else if (isTryOperation) {
- return false;
- }
- try {
- // Flush and merge operations should never reach this wait call, because they are always try operations.
- // If they fail to enter the components, then it means that there are an ongoing flush/merge operation on
- // the same components, so they should not proceed.
- if (opType == LSMOperationType.MODIFICATION) {
- // before waiting, make sure the index is in a modifiable state to avoid waiting forever.
- ensureIndexModifiable();
+ ILSMMemoryComponent flushingComponent =
+ (ILSMMemoryComponent) ctx.getComponentHolder().get(0);
+ if (!flushingComponent.isModified()) {
+ recycle(flushingComponent);
+ return false;
+ }
+ if (flushingComponent.getWriterCount() > 0) {
+ /*
+ * This case is a case where even though FLUSH log was flushed to disk
+ * and scheduleFlush is triggered, the current in-memory component (whose state was
+ * changed to READABLE_WRITABLE (RW) from READABLE_UNWRITABLE(RU) before FLUSH log
+ * was written to log tail (which is memory buffer of log file) and then the state was
+ * changed back to RW (as shown in the following scenario)) can have writers based on
+ * the current code base/design. Thus, the writer count of the component may be greater
+ * than 0. if this happens, intead of throwing exception, scheduleFlush() deal with
+ * this situation by not flushing the component.
+ * for more detailed information: ASTERIXDB-1027
+ */
+ return false;
+ }
+ break;
+ case MERGE:
+ if (ctx.getComponentHolder().size() < 2
+ && ctx.getOperation() != IndexOperation.DELETE_DISK_COMPONENTS) {
+ // There is only a single component. There is nothing to merge.
+ return false;
+ }
+ break;
+ default:
+ break;
}
- opTracker.wait();
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- throw HyracksDataException.create(e);
+ if (enterComponents(ctx, opType)) {
+ return true;
+ } else if (isTryOperation) {
+ return false;
+ }
+ try {
+ // Flush and merge operations should never reach this wait call,
+ // because they are always try operations. If they fail to enter the components,
+ // then it means that there are an ongoing flush/merge operation on
+ // the same components, so they should not proceed.
+ if (opType == LSMOperationType.MODIFICATION) {
+ // before waiting, make sure the index is in a modifiable state to avoid waiting forever.
+ ensureIndexModifiable();
+ }
+ opTracker.wait();
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ throw HyracksDataException.create(e);
+ }
}
}
+ } finally {
+ if (ctx.isTracingEnabled()) {
+ ctx.incrementEnterExitTime(System.nanoTime() - before);
+ }
+ }
+ }
+
+ private void recycle(ILSMMemoryComponent flushingComponent) throws HyracksDataException {
+ if (flushingComponent.getState() == ComponentState.READABLE_UNWRITABLE) {
+ //The mutable component has not been modified by any writer.
+ // There is nothing to flush. Since the component is empty, set its state back
+ // to READABLE_WRITABLE only when it's state has been set to READABLE_UNWRITABLE
+ flushingComponent.setState(ComponentState.READABLE_WRITABLE);
+ opTracker.notifyAll(); // NOSONAR: Always synchronized from caller
+ // Call recycled only when we change it's state is reset back to READABLE_WRITABLE
+ // Otherwise, if the component is in other state, e.g., INACTIVE, or
+ // READABLE_UNWRITABLE_FLUSHING, it's not considered as being recycled here.
+ lsmIndex.getIOOperationCallback().recycled(flushingComponent);
}
}
@@ -169,7 +194,7 @@
numEntered++;
}
entranceSuccessful = numEntered == components.size();
- } catch (Throwable e) {
+ } catch (Throwable e) { // NOSONAR: Log and re-throw
if (LOGGER.isLoggable(Level.SEVERE)) {
LOGGER.log(Level.SEVERE, opType.name() + " failed to enter components on " + lsmIndex, e);
}
@@ -186,23 +211,25 @@
i++;
numEntered--;
}
- return false;
}
- ctx.setAccessingComponents(true);
}
+ if (!entranceSuccessful) {
+ return false;
+ }
+ ctx.setAccessingComponents(true);
// Check if there is any action that is needed to be taken based on the operation type
switch (opType) {
case FLUSH:
- lsmIndex.getIOOperationCallback().beforeOperation(LSMOperationType.FLUSH);
+ lsmIndex.getIOOperationCallback().beforeOperation(LSMIOOperationType.FLUSH);
// Changing the flush status should *always* precede changing the mutable component.
lsmIndex.changeFlushStatusForCurrentMutableCompoent(false);
lsmIndex.changeMutableComponent();
// Notify all waiting threads whenever a flush has been scheduled since they will check
// again if they can grab and enter the mutable component.
- opTracker.notifyAll();
+ opTracker.notifyAll(); // NOSONAR: Always called from a synchronized block
break;
case MERGE:
- lsmIndex.getIOOperationCallback().beforeOperation(LSMOperationType.MERGE);
+ lsmIndex.getIOOperationCallback().beforeOperation(LSMIOOperationType.MERGE);
break;
default:
break;
@@ -211,8 +238,8 @@
return true;
}
- private void exitComponents(ILSMIndexOperationContext ctx, LSMOperationType opType, ILSMDiskComponent newComponent,
- boolean failedOperation) throws HyracksDataException {
+ private void doExitComponents(ILSMIndexOperationContext ctx, LSMOperationType opType,
+ ILSMDiskComponent newComponent, boolean failedOperation) throws HyracksDataException {
/**
* FLUSH and MERGE operations should always exit the components
* to notify waiting threads.
@@ -239,75 +266,10 @@
} else if (opType == LSMOperationType.MERGE) {
opTracker.notifyAll();
}
-
- int i = 0;
- // First check if there is any action that is needed to be taken based on the state of each component.
- for (ILSMComponent c : ctx.getComponentHolder()) {
- boolean isMutableComponent = i == 0 && c.getType() == LSMComponentType.MEMORY ? true : false;
- c.threadExit(opType, failedOperation, isMutableComponent);
- if (c.getType() == LSMComponentType.MEMORY) {
- switch (c.getState()) {
- case READABLE_UNWRITABLE:
- if (isMutableComponent && (opType == LSMOperationType.MODIFICATION
- || opType == LSMOperationType.FORCE_MODIFICATION)) {
- lsmIndex.changeFlushStatusForCurrentMutableCompoent(true);
- }
- break;
- case INACTIVE:
- tracer.instant(c.toString(), traceCategory, Scope.p, lsmIndex.toString());
- ((AbstractLSMMemoryComponent) c).reset();
- // Notify all waiting threads whenever the mutable component's state has changed to
- // inactive. This is important because even though we switched the mutable
- // components, it is possible that the component that we just switched to is still
- // busy flushing its data to disk. Thus, the notification that was issued upon
- // scheduling the flush is not enough.
- opTracker.notifyAll();
- break;
- default:
- break;
- }
- } else {
- switch (c.getState()) {
- case INACTIVE:
- lsmIndex.addInactiveDiskComponent((AbstractLSMDiskComponent) c);
- break;
- default:
- break;
- }
- }
- i++;
- }
+ exitOperationalComponents(ctx, opType, failedOperation);
ctx.setAccessingComponents(false);
- // Then, perform any action that is needed to be taken based on the operation type.
- switch (opType) {
- case FLUSH:
- // newComponent is null if the flush op. was not performed.
- if (!failedOperation && newComponent != null) {
- lsmIndex.addDiskComponent(newComponent);
- if (replicationEnabled) {
- componentsToBeReplicated.clear();
- componentsToBeReplicated.add(newComponent);
- triggerReplication(componentsToBeReplicated, false, opType);
- }
- mergePolicy.diskComponentAdded(lsmIndex, false);
- }
- break;
- case MERGE:
- // newComponent is null if the merge op. was not performed.
- if (!failedOperation && newComponent != null) {
- lsmIndex.subsumeMergedComponents(newComponent, ctx.getComponentHolder());
- if (replicationEnabled) {
- componentsToBeReplicated.clear();
- componentsToBeReplicated.add(newComponent);
- triggerReplication(componentsToBeReplicated, false, opType);
- }
- mergePolicy.diskComponentAdded(lsmIndex, fullMergeIsRequested.get());
- }
- break;
- default:
- break;
- }
- } catch (Throwable e) {
+ exitOperation(ctx, opType, newComponent, failedOperation);
+ } catch (Throwable e) { // NOSONAR: Log and re-throw
if (LOGGER.isLoggable(Level.SEVERE)) {
LOGGER.log(Level.SEVERE, e.getMessage(), e);
}
@@ -316,7 +278,8 @@
if (failedOperation && (opType == LSMOperationType.MODIFICATION
|| opType == LSMOperationType.FORCE_MODIFICATION)) {
//When the operation failed, completeOperation() method must be called
- //in order to decrement active operation count which was incremented in beforeOperation() method.
+ //in order to decrement active operation count which was incremented
+ // in beforeOperation() method.
opTracker.completeOperation(lsmIndex, opType, ctx.getSearchOperationCallback(),
ctx.getModificationCallback());
} else {
@@ -334,9 +297,9 @@
if (!inactiveDiskComponents.isEmpty()) {
for (ILSMDiskComponent inactiveComp : inactiveDiskComponents) {
if (inactiveComp.getFileReferenceCount() == 1) {
- if (inactiveDiskComponentsToBeDeleted == null) {
- inactiveDiskComponentsToBeDeleted = new LinkedList<>();
- }
+ inactiveDiskComponentsToBeDeleted =
+ inactiveDiskComponentsToBeDeleted == null ? new LinkedList<>()
+ : inactiveDiskComponentsToBeDeleted;
inactiveDiskComponentsToBeDeleted.add(inactiveComp);
}
}
@@ -360,15 +323,97 @@
for (ILSMDiskComponent c : inactiveDiskComponentsToBeDeleted) {
c.deactivateAndDestroy();
}
- } catch (Throwable e) {
+ } catch (Throwable e) { // NOSONAR Log and re-throw
if (LOGGER.isLoggable(Level.WARNING)) {
LOGGER.log(Level.WARNING, "Failure scheduling replication or destroying merged component", e);
}
- throw e;
+ throw e; // NOSONAR: The last call in the finally clause
}
}
}
+ }
+ private void exitOperation(ILSMIndexOperationContext ctx, LSMOperationType opType, ILSMDiskComponent newComponent,
+ boolean failedOperation) throws HyracksDataException {
+ // Then, perform any action that is needed to be taken based on the operation type.
+ switch (opType) {
+ case FLUSH:
+ // newComponent is null if the flush op. was not performed.
+ if (!failedOperation && newComponent != null) {
+ lsmIndex.addDiskComponent(newComponent);
+ if (replicationEnabled) {
+ componentsToBeReplicated.clear();
+ componentsToBeReplicated.add(newComponent);
+ triggerReplication(componentsToBeReplicated, false, opType);
+ }
+ mergePolicy.diskComponentAdded(lsmIndex, false);
+ }
+ break;
+ case MERGE:
+ // newComponent is null if the merge op. was not performed.
+ if (!failedOperation && newComponent != null) {
+ lsmIndex.subsumeMergedComponents(newComponent, ctx.getComponentHolder());
+ if (replicationEnabled) {
+ componentsToBeReplicated.clear();
+ componentsToBeReplicated.add(newComponent);
+ triggerReplication(componentsToBeReplicated, false, opType);
+ }
+ mergePolicy.diskComponentAdded(lsmIndex, fullMergeIsRequested.get());
+ }
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void exitOperationalComponents(ILSMIndexOperationContext ctx, LSMOperationType opType,
+ boolean failedOperation) throws HyracksDataException {
+ // First check if there is any action that is needed to be taken
+ // based on the state of each component.
+ for (int i = 0; i < ctx.getComponentHolder().size(); i++) {
+ ILSMComponent c = ctx.getComponentHolder().get(i);
+ boolean isMutableComponent = i == 0 && c.getType() == LSMComponentType.MEMORY ? true : false;
+ c.threadExit(opType, failedOperation, isMutableComponent);
+ if (c.getType() == LSMComponentType.MEMORY) {
+ switch (c.getState()) {
+ case READABLE_UNWRITABLE:
+ if (isMutableComponent && (opType == LSMOperationType.MODIFICATION
+ || opType == LSMOperationType.FORCE_MODIFICATION)) {
+ lsmIndex.changeFlushStatusForCurrentMutableCompoent(true);
+ }
+ break;
+ case INACTIVE:
+ tracer.instant(c.toString(), traceCategory, Scope.p, lsmIndex.toString());
+ ((AbstractLSMMemoryComponent) c).reset();
+ // Notify all waiting threads whenever the mutable component's state
+ // has changed to inactive. This is important because even though we switched
+ // the mutable components, it is possible that the component that we just
+ // switched to is still busy flushing its data to disk. Thus, the notification
+ // that was issued upon scheduling the flush is not enough.
+ opTracker.notifyAll(); // NOSONAR: Always called inside synchronized block
+ break;
+ default:
+ break;
+ }
+ } else if (c.getState() == ComponentState.INACTIVE) {
+ lsmIndex.addInactiveDiskComponent((AbstractLSMDiskComponent) c);
+ }
+ }
+ }
+
+ private void exitComponents(ILSMIndexOperationContext ctx, LSMOperationType opType, ILSMDiskComponent newComponent,
+ boolean failedOperation) throws HyracksDataException {
+ long before = 0L;
+ if (ctx.isTracingEnabled()) {
+ before = System.nanoTime();
+ }
+ try {
+ doExitComponents(ctx, opType, newComponent, failedOperation);
+ } finally {
+ if (ctx.isTracingEnabled()) {
+ ctx.incrementEnterExitTime(System.nanoTime() - before);
+ }
+ }
}
@Override
@@ -504,7 +549,7 @@
public void scheduleFlush(ILSMIndexOperationContext ctx, ILSMIOOperationCallback callback)
throws HyracksDataException {
if (!getAndEnterComponents(ctx, LSMOperationType.FLUSH, true)) {
- callback.afterFinalize(LSMOperationType.FLUSH, null);
+ callback.afterFinalize(LSMIOOperationType.FLUSH, null);
return;
}
lsmIndex.scheduleFlush(ctx, callback);
@@ -520,9 +565,9 @@
boolean failedOperation = false;
try {
newComponent = lsmIndex.flush(operation);
- operation.getCallback().afterOperation(LSMOperationType.FLUSH, null, newComponent);
+ operation.getCallback().afterOperation(LSMIOOperationType.FLUSH, null, newComponent);
newComponent.markAsValid(lsmIndex.isDurable());
- } catch (Throwable e) {
+ } catch (Throwable e) { // NOSONAR Log and re-throw
failedOperation = true;
if (LOGGER.isLoggable(Level.SEVERE)) {
LOGGER.log(Level.SEVERE, "Flush failed on " + lsmIndex, e);
@@ -530,7 +575,7 @@
throw e;
} finally {
exitComponents(ctx, LSMOperationType.FLUSH, newComponent, failedOperation);
- operation.getCallback().afterFinalize(LSMOperationType.FLUSH, newComponent);
+ operation.getCallback().afterFinalize(LSMIOOperationType.FLUSH, newComponent);
}
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Finished the flush operation for index: " + lsmIndex);
@@ -541,7 +586,7 @@
public void scheduleMerge(ILSMIndexOperationContext ctx, ILSMIOOperationCallback callback)
throws HyracksDataException {
if (!getAndEnterComponents(ctx, LSMOperationType.MERGE, true)) {
- callback.afterFinalize(LSMOperationType.MERGE, null);
+ callback.afterFinalize(LSMIOOperationType.MERGE, null);
return;
}
lsmIndex.scheduleMerge(ctx, callback);
@@ -552,9 +597,10 @@
throws HyracksDataException {
fullMergeIsRequested.set(true);
if (!getAndEnterComponents(ctx, LSMOperationType.MERGE, true)) {
- // If the merge cannot be scheduled because there is already an ongoing merge on subset/all of the components, then
- // whenever the current merge has finished, it will schedule the full merge again.
- callback.afterFinalize(LSMOperationType.MERGE, null);
+ // If the merge cannot be scheduled because there is already an ongoing merge on
+ // subset/all of the components, then whenever the current merge has finished,
+ // it will schedule the full merge again.
+ callback.afterFinalize(LSMIOOperationType.MERGE, null);
return;
}
fullMergeIsRequested.set(false);
@@ -571,9 +617,9 @@
boolean failedOperation = false;
try {
newComponent = lsmIndex.merge(operation);
- operation.getCallback().afterOperation(LSMOperationType.MERGE, ctx.getComponentHolder(), newComponent);
+ operation.getCallback().afterOperation(LSMIOOperationType.MERGE, ctx.getComponentHolder(), newComponent);
newComponent.markAsValid(lsmIndex.isDurable());
- } catch (Throwable e) {
+ } catch (Throwable e) { // NOSONAR: Log and re-throw
failedOperation = true;
if (LOGGER.isLoggable(Level.SEVERE)) {
LOGGER.log(Level.SEVERE, "Failed merge operation on " + lsmIndex, e);
@@ -596,7 +642,7 @@
// 8. completeOperation (decrement the numOfIoOperations)
opTracker.completeOperation(lsmIndex, LSMOperationType.MERGE, ctx.getSearchOperationCallback(),
ctx.getModificationCallback());
- operation.getCallback().afterFinalize(LSMOperationType.MERGE, newComponent);
+ operation.getCallback().afterFinalize(LSMIOOperationType.MERGE, newComponent);
}
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Finished the merge operation for index: " + lsmIndex);
@@ -624,8 +670,7 @@
protected void triggerReplication(List<ILSMDiskComponent> lsmComponents, boolean bulkload, LSMOperationType opType)
throws HyracksDataException {
- ILSMIndexAccessor accessor =
- lsmIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = lsmIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleReplication(lsmComponents, bulkload, opType);
}
@@ -698,6 +743,7 @@
throw e;
} finally {
exit(ctx);
+ ctx.logPerformanceCounters(accessor.getTupleCount());
}
}
@@ -869,4 +915,36 @@
public String toString() {
return getClass().getSimpleName() + ":" + lsmIndex;
}
+
+ @Override
+ public void replaceMemoryComponentsWithDiskComponents(ILSMIndexOperationContext ctx, int startIndex)
+ throws HyracksDataException {
+ synchronized (opTracker) {
+ componentReplacementCtx.reset();
+ for (int i = 0; i < ctx.getComponentHolder().size(); i++) {
+ if (i >= startIndex) {
+ ILSMComponent next = ctx.getComponentHolder().get(i);
+ if (next.getType() == LSMComponentType.MEMORY
+ && next.getState() == ComponentState.UNREADABLE_UNWRITABLE) {
+ componentReplacementCtx.getComponentHolder().add(next);
+ componentReplacementCtx.swapIndex(i);
+ }
+ }
+ }
+ if (componentReplacementCtx.getComponentHolder().isEmpty()) {
+ throw new IllegalStateException(
+ "replaceMemoryComponentsWithDiskComponents called with no potential components");
+ }
+ // before we exit, we should keep the replaced component ids
+ // we should also ensure that exact disk component replacement exist
+ if (componentReplacementCtx.proceed(lsmIndex.getDiskComponents())) {
+ // exit old component
+ exitComponents(componentReplacementCtx, LSMOperationType.SEARCH, null, false);
+ // enter new component
+ componentReplacementCtx.prepareToEnter();
+ enterComponents(componentReplacementCtx, LSMOperationType.SEARCH);
+ componentReplacementCtx.replace(ctx);
+ }
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexDiskComponentBulkLoader.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexDiskComponentBulkLoader.java
index 8befee1..7bc0660 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexDiskComponentBulkLoader.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexDiskComponentBulkLoader.java
@@ -21,13 +21,14 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentBulkLoader;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
public class LSMIndexDiskComponentBulkLoader implements IIndexBulkLoader {
private final AbstractLSMIndex lsmIndex;
private final ILSMDiskComponent component;
- private final IIndexBulkLoader componentBulkLoader;
+ private final ILSMDiskComponentBulkLoader componentBulkLoader;
public LSMIndexDiskComponentBulkLoader(AbstractLSMIndex lsmIndex, float fillFactor, boolean verifyInput,
long numElementsHint) throws HyracksDataException {
@@ -39,26 +40,43 @@
component.createBulkLoader(fillFactor, verifyInput, numElementsHint, false, true, true);
}
+ public ILSMDiskComponent getComponent() {
+ return component;
+ }
+
@Override
public void add(ITupleReference tuple) throws HyracksDataException {
componentBulkLoader.add(tuple);
}
+ public void delete(ITupleReference tuple) throws HyracksDataException {
+ componentBulkLoader.delete(tuple);
+ }
+
@Override
public void end() throws HyracksDataException {
- componentBulkLoader.end();
- if (component.getComponentSize() > 0) {
- //TODO(amoudi): Ensure Bulk load follow the same lifecycle Other Operations (Flush, Merge, etc).
- //then after operation should be called from harness as well
- //https://issues.apache.org/jira/browse/ASTERIXDB-1764
- lsmIndex.getIOOperationCallback().afterOperation(LSMOperationType.FLUSH, null, component);
- lsmIndex.getLsmHarness().addBulkLoadedComponent(component);
+ try {
+ componentBulkLoader.end();
+ if (component.getComponentSize() > 0) {
+ //TODO(amoudi): Ensure Bulk load follow the same lifecycle Other Operations (Flush, Merge, etc).
+ //then after operation should be called from harness as well
+ //https://issues.apache.org/jira/browse/ASTERIXDB-1764
+ lsmIndex.getIOOperationCallback().afterOperation(LSMIOOperationType.LOAD, null, component);
+ lsmIndex.getHarness().addBulkLoadedComponent(component);
+ }
+ } finally {
+ lsmIndex.getIOOperationCallback().afterFinalize(LSMIOOperationType.LOAD, component);
}
}
@Override
public void abort() throws HyracksDataException {
- componentBulkLoader.abort();
+ try {
+ componentBulkLoader.abort();
+ lsmIndex.getIOOperationCallback().afterOperation(LSMIOOperationType.LOAD, null, null);
+ } finally {
+ lsmIndex.getIOOperationCallback().afterFinalize(LSMIOOperationType.LOAD, null);
+ }
}
}
\ No newline at end of file
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexReplicationJob.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexReplicationJob.java
index a35d00e..1c28ef1 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexReplicationJob.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexReplicationJob.java
@@ -45,7 +45,7 @@
@Override
public void endReplication() throws HyracksDataException {
if (operationContext != null) {
- ((AbstractLSMIndex) (lsmIndex)).getLsmHarness().endReplication(operationContext);
+ ((AbstractLSMIndex) (lsmIndex)).getHarness().endReplication(operationContext);
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
index 724a909..17c681c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/LSMIndexSearchCursor.java
@@ -24,6 +24,7 @@
import java.util.PriorityQueue;
import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
@@ -36,9 +37,13 @@
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public abstract class LSMIndexSearchCursor implements ITreeIndexCursor {
+ protected static final int SWITCH_COMPONENT_CYCLE = 100;
protected final ILSMIndexOperationContext opCtx;
protected final boolean returnDeletedTuples;
protected PriorityQueueElement outputElement;
+ protected final ArrayTupleBuilder[] switchComponentTupleBuilders;
+ protected final boolean[] switchRequest;
+ protected final PriorityQueueElement[] switchedElements;
protected IIndexCursor[] rangeCursors;
protected PriorityQueueElement[] pqes;
protected PriorityQueue<PriorityQueueElement> outputPriorityQueue;
@@ -47,6 +52,8 @@
protected boolean needPushElementIntoQueue;
protected boolean includeMutableComponent;
protected ILSMHarness lsmHarness;
+ protected boolean switchPossible = true;
+ protected int hasNextCallCount = 0;
protected List<ILSMComponent> operationalComponents;
@@ -55,6 +62,9 @@
this.returnDeletedTuples = returnDeletedTuples;
outputElement = null;
needPushElementIntoQueue = false;
+ switchComponentTupleBuilders = new ArrayTupleBuilder[opCtx.getIndex().getNumberOfAllMemoryComponents()];
+ switchRequest = new boolean[switchComponentTupleBuilders.length];
+ switchedElements = new PriorityQueueElement[switchComponentTupleBuilders.length];
}
public ILSMIndexOperationContext getOpCtx() {
@@ -98,9 +108,13 @@
@Override
public void reset() throws HyracksDataException {
+ hasNextCallCount = 0;
+ switchPossible = true;
outputElement = null;
needPushElementIntoQueue = false;
-
+ for (int i = 0; i < switchRequest.length; i++) {
+ switchRequest[i] = false;
+ }
try {
if (outputPriorityQueue != null) {
outputPriorityQueue.clear();
@@ -121,6 +135,7 @@
@Override
public boolean hasNext() throws HyracksDataException {
+ hasNextCallCount++;
checkPriorityQueue();
return !outputPriorityQueue.isEmpty();
}
@@ -196,7 +211,7 @@
}
protected void checkPriorityQueue() throws HyracksDataException {
- while (!outputPriorityQueue.isEmpty() || (needPushElementIntoQueue == true)) {
+ while (!outputPriorityQueue.isEmpty() || needPushElementIntoQueue) {
if (!outputPriorityQueue.isEmpty()) {
PriorityQueueElement checkElement = outputPriorityQueue.peek();
// If there is no previous tuple or the previous tuple can be ignored
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MergeOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MergeOperation.java
index c83d534..e16da5b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MergeOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/MergeOperation.java
@@ -47,8 +47,8 @@
}
@Override
- public LSMIOOpertionType getIOOpertionType() {
- return LSMIOOpertionType.MERGE;
+ public LSMIOOperationType getIOOpertionType() {
+ return LSMIOOperationType.MERGE;
}
public IIndexCursor getCursor() {
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/NoOpIOOperationCallbackFactory.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/NoOpIOOperationCallbackFactory.java
index da8bc46..21d10d7 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/NoOpIOOperationCallbackFactory.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/NoOpIOOperationCallbackFactory.java
@@ -20,14 +20,15 @@
import java.util.List;
+import org.apache.hyracks.api.application.INCServiceContext;
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
public enum NoOpIOOperationCallbackFactory implements ILSMIOOperationCallbackFactory {
INSTANCE;
@@ -37,6 +38,11 @@
return NoOpIOOperationCallback.INSTANCE;
}
+ @Override
+ public void initialize(INCServiceContext ncCtx) {
+ // No op
+ }
+
public static class NoOpIOOperationCallback implements ILSMIOOperationCallback {
private static final NoOpIOOperationCallback INSTANCE = new NoOpIOOperationCallback();
@@ -44,18 +50,19 @@
}
@Override
- public void beforeOperation(LSMOperationType opType) throws HyracksDataException {
+ public void beforeOperation(LSMIOOperationType opType) throws HyracksDataException {
// Do nothing.
}
@Override
- public void afterOperation(LSMOperationType opType, List<ILSMComponent> oldComponents,
+ public void afterOperation(LSMIOOperationType opType, List<ILSMComponent> oldComponents,
ILSMDiskComponent newComponent) throws HyracksDataException {
// Do nothing.
}
@Override
- public void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent) throws HyracksDataException {
+ public void afterFinalize(LSMIOOperationType opType, ILSMDiskComponent newComponent)
+ throws HyracksDataException {
// Do nothing.
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/PrefixMergePolicy.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/PrefixMergePolicy.java
index 7d7266e..73b5d20 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/PrefixMergePolicy.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/PrefixMergePolicy.java
@@ -26,7 +26,7 @@
import org.apache.commons.lang3.tuple.Pair;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.ComponentState;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
@@ -59,8 +59,7 @@
}
if (fullMergeIsRequested) {
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleFullMerge(index.getIOOperationCallback());
return;
}
@@ -245,8 +244,7 @@
// Reverse the components order back to its original order
Collections.reverse(mergableComponents);
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleMerge(index.getIOOperationCallback(), mergableComponents);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java
index 0f3c90f..238e915 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/StubIOOperationCallback.java
@@ -23,9 +23,9 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
/**
* This class is for testing. It's basically a way to get the new/old component info from the
@@ -38,19 +38,19 @@
private ILSMDiskComponent newComponent = null;
@Override
- public void beforeOperation(LSMOperationType opType) throws HyracksDataException {
+ public void beforeOperation(LSMIOOperationType opType) throws HyracksDataException {
// Not interested in this
}
@Override
- public void afterOperation(LSMOperationType opType, List<ILSMComponent> oldComponents,
+ public void afterOperation(LSMIOOperationType opType, List<ILSMComponent> oldComponents,
ILSMDiskComponent newComponent) throws HyracksDataException {
this.oldComponents = oldComponents;
this.newComponent = newComponent;
}
@Override
- public synchronized void afterFinalize(LSMOperationType opType, ILSMDiskComponent newComponent)
+ public synchronized void afterFinalize(LSMIOOperationType opType, ILSMDiskComponent newComponent)
throws HyracksDataException {
// Redundant info from after
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
index 6cb96aa..a7fbe06 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/ThreadCountingTracker.java
@@ -21,7 +21,7 @@
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
@@ -57,8 +57,7 @@
// Flush will only be handled by last exiting thread.
if (opType == LSMOperationType.MODIFICATION && threadRefCount.decrementAndGet() == 0
&& index.hasFlushRequestForCurrentMutableComponent()) {
- ILSMIndexAccessor accessor =
- index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
accessor.scheduleFlush(NoOpIOOperationCallbackFactory.INSTANCE.createIoOpCallback(index));
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
index 88f3231..4cfc3b6 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/impls/TracedIOOperation.java
@@ -35,7 +35,7 @@
static final Logger LOGGER = Logger.getLogger(TracedIOOperation.class.getName());
protected final ILSMIOOperation ioOp;
- private final LSMIOOpertionType ioOpType;
+ private final LSMIOOperationType ioOpType;
private final ITracer tracer;
private final long traceCategory;
@@ -80,7 +80,7 @@
}
@Override
- public LSMIOOpertionType getIOOpertionType() {
+ public LSMIOOperationType getIOOpertionType() {
return ioOpType;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/LSMComponentIdUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/LSMComponentIdUtils.java
new file mode 100644
index 0000000..3c88543
--- /dev/null
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-common/src/main/java/org/apache/hyracks/storage/am/lsm/common/util/LSMComponentIdUtils.java
@@ -0,0 +1,62 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.hyracks.storage.am.lsm.common.util;
+
+import org.apache.hyracks.api.exceptions.HyracksDataException;
+import org.apache.hyracks.data.std.primitive.LongPointable;
+import org.apache.hyracks.storage.am.common.freepage.MutableArrayValueReference;
+import org.apache.hyracks.storage.am.lsm.common.api.IComponentMetadata;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentId;
+import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentId;
+
+public class LSMComponentIdUtils {
+
+ private static final MutableArrayValueReference COMPONENT_ID_MIN_KEY =
+ new MutableArrayValueReference("Component_Id_Min".getBytes());
+
+ private static final MutableArrayValueReference COMPONENT_ID_MAX_KEY =
+ new MutableArrayValueReference("Component_Id_Max".getBytes());
+
+ private LSMComponentIdUtils() {
+
+ }
+
+ public static ILSMComponentId readFrom(IComponentMetadata metadata) throws HyracksDataException {
+ long minId = ComponentUtils.getLong(metadata, COMPONENT_ID_MIN_KEY, LSMComponentId.NOT_FOUND);
+ long maxId = ComponentUtils.getLong(metadata, COMPONENT_ID_MAX_KEY, LSMComponentId.NOT_FOUND);
+ if (minId == LSMComponentId.NOT_FOUND || maxId == LSMComponentId.NOT_FOUND) {
+ return LSMComponentId.MISSING_COMPONENT_ID;
+ } else {
+ return new LSMComponentId(minId, maxId);
+ }
+ }
+
+ public static void persist(ILSMComponentId id, IComponentMetadata metadata) throws HyracksDataException {
+ LSMComponentId componentId = (LSMComponentId) id;
+ metadata.put(COMPONENT_ID_MIN_KEY, LongPointable.FACTORY.createPointable(componentId.getMinId()));
+ metadata.put(COMPONENT_ID_MAX_KEY, LongPointable.FACTORY.createPointable(componentId.getMaxId()));
+ }
+
+ public static ILSMComponentId union(ILSMComponentId id1, ILSMComponentId id2) {
+ long minId = Long.min(((LSMComponentId) id1).getMinId(), ((LSMComponentId) id2).getMinId());
+ long maxId = Long.max(((LSMComponentId) id1).getMaxId(), ((LSMComponentId) id2).getMaxId());
+ return new LSMComponentId(minId, maxId);
+ }
+
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/dataflow/LSMInvertedIndexLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/dataflow/LSMInvertedIndexLocalResource.java
index cdb55bf..a45f006 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/dataflow/LSMInvertedIndexLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/dataflow/LSMInvertedIndexLocalResource.java
@@ -87,6 +87,7 @@
IBufferCache bufferCache = storageManager.getBufferCache(serviceCtx);
ILSMMergePolicy mergePolicy = mergePolicyFactory.createMergePolicy(mergePolicyProperties, serviceCtx);
ILSMIOOperationScheduler ioScheduler = ioSchedulerProvider.getIoScheduler(serviceCtx);
+ ioOpCallbackFactory.initialize(serviceCtx);
if (isPartitioned) {
return InvertedIndexUtils.createPartitionedLSMInvertedIndex(ioManager, virtualBufferCaches, typeTraits,
cmpFactories, tokenTypeTraits, tokenCmpFactories, tokenizerFactory, bufferCache,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
index 59a9320..030e4fd 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndex.java
@@ -36,7 +36,7 @@
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.btree.util.BTreeUtils;
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentFilterHelper;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
@@ -68,6 +68,7 @@
import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
import org.apache.hyracks.storage.am.lsm.invertedindex.util.InvertedIndexUtils;
import org.apache.hyracks.storage.common.ICursorInitialState;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
@@ -201,18 +202,18 @@
ILSMComponent component = operationalComponents.get(i);
if (component.getType() == LSMComponentType.MEMORY) {
includeMutableComponent = true;
- IIndexAccessor invIndexAccessor = component.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ IIndexAccessor invIndexAccessor =
+ component.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
indexAccessors.add(invIndexAccessor);
IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexMemoryComponent) component).getBuddyIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ .createAccessor(NoOpIndexAccessParameters.INSTANCE);
deletedKeysBTreeAccessors.add(deletedKeysAccessor);
} else {
- IIndexAccessor invIndexAccessor = component.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ IIndexAccessor invIndexAccessor =
+ component.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
indexAccessors.add(invIndexAccessor);
IIndexAccessor deletedKeysAccessor = ((LSMInvertedIndexDiskComponent) component).getBuddyIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ .createAccessor(NoOpIndexAccessParameters.INSTANCE);
deletedKeysBTreeAccessors.add(deletedKeysAccessor);
}
}
@@ -236,7 +237,7 @@
deletedKeysBTreeAccessors,
((LSMInvertedIndexMemoryComponent) memoryComponents.get(currentMutableComponentId.get()))
.getBuddyIndex().getLeafFrameFactory(),
- ictx, includeMutableComponent, getLsmHarness(), operationalComponents);
+ ictx, includeMutableComponent, getHarness(), operationalComponents);
} else {
LSMInvertedIndexMemoryComponent mutableComponent =
(LSMInvertedIndexMemoryComponent) memoryComponents.get(currentMutableComponentId.get());
@@ -245,7 +246,7 @@
initState = new LSMInvertedIndexRangeSearchCursorInitialState(tokensAndKeysCmp, keyCmp, keysOnlyTuple,
((LSMInvertedIndexMemoryComponent) memoryComponents.get(currentMutableComponentId.get()))
.getBuddyIndex().getLeafFrameFactory(),
- includeMutableComponent, getLsmHarness(), indexAccessors, deletedKeysBTreeAccessors, pred,
+ includeMutableComponent, getHarness(), indexAccessors, deletedKeysBTreeAccessors, pred,
operationalComponents);
}
return initState;
@@ -280,8 +281,8 @@
RangePredicate nullPred = new RangePredicate(null, null, true, true, null, null);
// Search the deleted keys BTree to calculate the number of elements for BloomFilter
- BTreeAccessor deletedKeysBTreeAccessor = flushingComponent.getBuddyIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ BTreeAccessor deletedKeysBTreeAccessor =
+ flushingComponent.getBuddyIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
IIndexCursor btreeCountingCursor = deletedKeysBTreeAccessor.createCountingSearchCursor();
deletedKeysBTreeAccessor.search(btreeCountingCursor, nullPred);
long numBTreeTuples = 0L;
@@ -312,8 +313,8 @@
}
// Scan the in-memory inverted index
- InMemoryInvertedIndexAccessor memInvIndexAccessor = flushingComponent.getIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ InMemoryInvertedIndexAccessor memInvIndexAccessor =
+ flushingComponent.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
BTreeAccessor memBTreeAccessor = memInvIndexAccessor.getBTreeAccessor();
IIndexCursor scanCursor = memBTreeAccessor.createSearchCursor(false);
memBTreeAccessor.search(scanCursor, nullPred);
@@ -425,16 +426,16 @@
}
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException {
- return new LSMInvertedIndexAccessor(getLsmHarness(), createOpContext(modificationCallback, searchCallback));
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) throws HyracksDataException {
+ return new LSMInvertedIndexAccessor(getHarness(),
+ createOpContext(iap.getModificationCallback(), iap.getSearchOperationCallback()));
}
@Override
protected LSMInvertedIndexOpContext createOpContext(IModificationOperationCallback modificationCallback,
ISearchOperationCallback searchCallback) throws HyracksDataException {
- return new LSMInvertedIndexOpContext(memoryComponents, modificationCallback, searchCallback,
- invertedIndexFieldsForNonBulkLoadOps, filterFieldsForNonBulkLoadOps, getFilterCmpFactories());
+ return new LSMInvertedIndexOpContext(this, memoryComponents, modificationCallback, searchCallback,
+ invertedIndexFieldsForNonBulkLoadOps, filterFieldsForNonBulkLoadOps, getFilterCmpFactories(), tracer);
}
@Override
@@ -480,7 +481,7 @@
protected ILSMIOOperation createFlushOperation(AbstractLSMIndexOperationContext opCtx,
LSMComponentFileReferences componentFileRefs, ILSMIOOperationCallback callback)
throws HyracksDataException {
- return new LSMInvertedIndexFlushOperation(new LSMInvertedIndexAccessor(getLsmHarness(), opCtx),
+ return new LSMInvertedIndexFlushOperation(new LSMInvertedIndexAccessor(getHarness(), opCtx),
componentFileRefs.getInsertIndexFileReference(), componentFileRefs.getDeleteIndexFileReference(),
componentFileRefs.getBloomFilterFileReference(), callback, fileManager.getBaseDir().getAbsolutePath());
}
@@ -488,7 +489,7 @@
@Override
protected ILSMIOOperation createMergeOperation(AbstractLSMIndexOperationContext opCtx,
LSMComponentFileReferences mergeFileRefs, ILSMIOOperationCallback callback) throws HyracksDataException {
- ILSMIndexAccessor accessor = new LSMInvertedIndexAccessor(getLsmHarness(), opCtx);
+ ILSMIndexAccessor accessor = new LSMInvertedIndexAccessor(getHarness(), opCtx);
IIndexCursor cursor = new LSMInvertedIndexRangeSearchCursor(opCtx);
return new LSMInvertedIndexMergeOperation(accessor, cursor, mergeFileRefs.getInsertIndexFileReference(),
mergeFileRefs.getDeleteIndexFileReference(), mergeFileRefs.getBloomFilterFileReference(), callback,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java
index 30300d3..55da252 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/impls/LSMInvertedIndexOpContext.java
@@ -23,14 +23,16 @@
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.api.exceptions.HyracksDataException;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndexAccessor;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
+import org.apache.hyracks.util.trace.ITracer;
public class LSMInvertedIndexOpContext extends AbstractLSMIndexOperationContext {
@@ -45,11 +47,12 @@
private IInvertedIndexAccessor currentMutableInvIndexAccessors;
private IIndexAccessor currentDeletedKeysBTreeAccessors;
- public LSMInvertedIndexOpContext(List<ILSMMemoryComponent> mutableComponents,
+ public LSMInvertedIndexOpContext(ILSMIndex index, List<ILSMMemoryComponent> mutableComponents,
IModificationOperationCallback modificationCallback, ISearchOperationCallback searchCallback,
- int[] invertedIndexFields, int[] filterFields, IBinaryComparatorFactory[] filterComparatorFactories)
- throws HyracksDataException {
- super(invertedIndexFields, filterFields, filterComparatorFactories, searchCallback, modificationCallback);
+ int[] invertedIndexFields, int[] filterFields, IBinaryComparatorFactory[] filterComparatorFactories,
+ ITracer tracer) throws HyracksDataException {
+ super(index, invertedIndexFields, filterFields, filterComparatorFactories, searchCallback, modificationCallback,
+ tracer);
mutableInvIndexAccessors = new IInvertedIndexAccessor[mutableComponents.size()];
deletedKeysBTreeAccessors = new IIndexAccessor[mutableComponents.size()];
for (int i = 0; i < mutableComponents.size(); i++) {
@@ -58,11 +61,11 @@
if (allFields != null) {
mutableInvIndexAccessors[i] = mutableComponent.getIndex().createAccessor(allFields);
} else {
- mutableInvIndexAccessors[i] = mutableComponent.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ mutableInvIndexAccessors[i] =
+ mutableComponent.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
- deletedKeysBTreeAccessors[i] = mutableComponent.getBuddyIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ deletedKeysBTreeAccessors[i] =
+ mutableComponent.getBuddyIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
// Project away the document fields, leaving only the key fields.
LSMInvertedIndexMemoryComponent c = (LSMInvertedIndexMemoryComponent) mutableComponents.get(0);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndex.java
index 50160f9..641ca3c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndex.java
@@ -34,9 +34,8 @@
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInPlaceInvertedIndex;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedListCursor;
import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public class InMemoryInvertedIndex implements IInPlaceInvertedIndex {
@@ -166,8 +165,7 @@
}
@Override
- public InMemoryInvertedIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException {
+ public InMemoryInvertedIndexAccessor createAccessor(IIndexAccessParameters iap) throws HyracksDataException {
return new InMemoryInvertedIndexAccessor(this,
new InMemoryInvertedIndexOpContext(btree, tokenCmpFactories, tokenizerFactory));
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexAccessor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexAccessor.java
index 73f90a6..6777177 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexAccessor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexAccessor.java
@@ -26,6 +26,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTree.BTreeAccessor;
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndexAccessor;
@@ -51,8 +52,7 @@
this.opCtx = opCtx;
this.index = index;
this.searcher = createSearcher();
- this.btreeAccessor =
- index.getBTree().createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ this.btreeAccessor = index.getBTree().createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
public InMemoryInvertedIndexAccessor(InMemoryInvertedIndex index, IIndexOperationContext opCtx,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java
index 90dbc81..eec20fd 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/InMemoryInvertedIndexOpContext.java
@@ -24,7 +24,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTree.BTreeAccessor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizer;
import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
@@ -67,8 +67,7 @@
case SEARCH: {
if (getBtreePred() == null) {
btreePred = new RangePredicate(null, null, true, true, null, null);
- btreeAccessor =
- btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessor = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
btreeCmp = MultiComparator.create(btree.getComparatorFactories());
tokenFieldsCmp = MultiComparator.create(tokenCmpFactories);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndex.java
index 933ef21..5ddba98 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/inmemory/PartitionedInMemoryInvertedIndex.java
@@ -37,8 +37,7 @@
import org.apache.hyracks.storage.am.lsm.invertedindex.search.PartitionedTOccurrenceSearcher;
import org.apache.hyracks.storage.am.lsm.invertedindex.tokenizers.IBinaryTokenizerFactory;
import org.apache.hyracks.storage.am.lsm.invertedindex.util.PartitionedInvertedIndexTokenizingTupleIterator;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public class PartitionedInMemoryInvertedIndex extends InMemoryInvertedIndex implements IPartitionedInvertedIndex {
@@ -87,8 +86,8 @@
}
@Override
- public PartitionedInMemoryInvertedIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException {
+ public PartitionedInMemoryInvertedIndexAccessor createAccessor(IIndexAccessParameters iap)
+ throws HyracksDataException {
return new PartitionedInMemoryInvertedIndexAccessor(this,
new PartitionedInMemoryInvertedIndexOpContext(btree, tokenCmpFactories, tokenizerFactory));
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
index 7f75264..5301fa1 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndex.java
@@ -41,7 +41,7 @@
import org.apache.hyracks.storage.am.btree.util.BTreeUtils;
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
import org.apache.hyracks.storage.am.common.api.IPageManagerFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInPlaceInvertedIndex;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndexAccessor;
@@ -50,11 +50,10 @@
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedListCursor;
import org.apache.hyracks.storage.am.lsm.invertedindex.search.InvertedIndexSearchPredicate;
import org.apache.hyracks.storage.am.lsm.invertedindex.search.TOccurrenceSearcher;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.MultiComparator;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
@@ -486,8 +485,7 @@
}
@Override
- public OnDiskInvertedIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException {
+ public OnDiskInvertedIndexAccessor createAccessor(IIndexAccessParameters iap) throws HyracksDataException {
return new OnDiskInvertedIndexAccessor(this);
}
@@ -542,8 +540,7 @@
public void validate() throws HyracksDataException {
btree.validate();
// Scan the btree and validate the order of elements in each inverted-list.
- IIndexAccessor btreeAccessor =
- btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor btreeAccessor = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
IIndexCursor btreeCursor = btreeAccessor.createSearchCursor(false);
MultiComparator btreeCmp = MultiComparator.create(btree.getComparatorFactories());
RangePredicate rangePred = new RangePredicate(null, null, true, true, btreeCmp, btreeCmp);
@@ -553,8 +550,7 @@
}
PermutingTupleReference tokenTuple = new PermutingTupleReference(fieldPermutation);
- IInvertedIndexAccessor invIndexAccessor =
- createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IInvertedIndexAccessor invIndexAccessor = createAccessor(NoOpIndexAccessParameters.INSTANCE);
IInvertedListCursor invListCursor = invIndexAccessor.createInvertedListCursor();
MultiComparator invListCmp = MultiComparator.create(invListCmpFactories);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java
index 69bf2a2..623fc74 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexOpContext.java
@@ -22,7 +22,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
@@ -39,7 +39,7 @@
public OnDiskInvertedIndexOpContext(BTree btree) {
// TODO: Ignore opcallbacks for now.
- btreeAccessor = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessor = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
btreeCursor = btreeAccessor.createSearchCursor(false);
searchCmp = MultiComparator.create(btree.getComparatorFactories());
if (btree.getComparatorFactories().length > 1) {
@@ -81,4 +81,5 @@
public MultiComparator getPrefixSearchCmp() {
return prefixSearchCmp;
}
+
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
index fc6f025..b2aff3a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/OnDiskInvertedIndexRangeSearchCursor.java
@@ -23,7 +23,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.tuples.ConcatenatingTupleReference;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInPlaceInvertedIndex;
@@ -53,7 +53,7 @@
public OnDiskInvertedIndexRangeSearchCursor(IInPlaceInvertedIndex invIndex, IIndexOperationContext opCtx) {
this.btree = ((OnDiskInvertedIndex) invIndex).getBTree();
- this.btreeAccessor = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ this.btreeAccessor = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
this.invIndex = invIndex;
this.opCtx = opCtx;
// Project away non-token fields of the BTree tuples.
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
index 569c51d..a33d6d3 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-invertedindex/src/main/java/org/apache/hyracks/storage/am/lsm/invertedindex/ondisk/PartitionedOnDiskInvertedIndex.java
@@ -35,8 +35,7 @@
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IPartitionedInvertedIndex;
import org.apache.hyracks.storage.am.lsm.invertedindex.search.InvertedListPartitions;
import org.apache.hyracks.storage.am.lsm.invertedindex.search.PartitionedTOccurrenceSearcher;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
public class PartitionedOnDiskInvertedIndex extends OnDiskInvertedIndex implements IPartitionedInvertedIndex {
@@ -58,8 +57,8 @@
}
@Override
- public PartitionedOnDiskInvertedIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException {
+ public PartitionedOnDiskInvertedIndexAccessor createAccessor(IIndexAccessParameters iap)
+ throws HyracksDataException {
return new PartitionedOnDiskInvertedIndexAccessor(this);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeLocalResource.java
index f0ea5b8..9960590 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/ExternalRTreeLocalResource.java
@@ -66,12 +66,13 @@
public IIndex createInstance(INCServiceContext ncServiceCtx) throws HyracksDataException {
IIOManager ioManager = ncServiceCtx.getIoManager();
FileReference fileRef = ioManager.resolve(path);
+ ioOpCallbackFactory.initialize(ncServiceCtx);
return LSMRTreeUtils.createExternalRTree(ioManager, fileRef, storageManager.getBufferCache(ncServiceCtx),
typeTraits, cmpFactories, btreeCmpFactories, valueProviderFactories, rtreePolicyType,
bloomFilterFalsePositiveRate, mergePolicyFactory.createMergePolicy(mergePolicyProperties, ncServiceCtx),
opTrackerProvider.getOperationTracker(ncServiceCtx), ioSchedulerProvider.getIoScheduler(ncServiceCtx),
ioOpCallbackFactory, linearizeCmpFactory, buddyBTreeFields, durable, isPointMBR,
- metadataPageManagerFactory);
+ metadataPageManagerFactory, ncServiceCtx.getTracer());
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeLocalResource.java
index 1fa5081..f6396cf 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeLocalResource.java
@@ -83,6 +83,7 @@
IIOManager ioManager = ncServiceCtx.getIoManager();
FileReference fileRef = ioManager.resolve(path);
List<IVirtualBufferCache> virtualBufferCaches = vbcProvider.getVirtualBufferCaches(ncServiceCtx, fileRef);
+ ioOpCallbackFactory.initialize(ncServiceCtx);
return LSMRTreeUtils.createLSMTree(ioManager, virtualBufferCaches, fileRef,
storageManager.getBufferCache(ncServiceCtx), typeTraits, cmpFactories, btreeCmpFactories,
valueProviderFactories, rtreePolicyType, bloomFilterFalsePositiveRate,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeWithAntiMatterLocalResource.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeWithAntiMatterLocalResource.java
index aea205d..f586d51 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeWithAntiMatterLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/dataflow/LSMRTreeWithAntiMatterLocalResource.java
@@ -78,12 +78,13 @@
IIOManager ioManager = serviceCtx.getIoManager();
FileReference file = ioManager.resolve(path);
List<IVirtualBufferCache> virtualBufferCaches = vbcProvider.getVirtualBufferCaches(serviceCtx, file);
+ ioOpCallbackFactory.initialize(serviceCtx);
return LSMRTreeUtils.createLSMTreeWithAntiMatterTuples(ioManager, virtualBufferCaches, file,
storageManager.getBufferCache(serviceCtx), typeTraits, cmpFactories, btreeComparatorFactories,
valueProviderFactories, rtreePolicyType,
mergePolicyFactory.createMergePolicy(mergePolicyProperties, serviceCtx),
opTrackerProvider.getOperationTracker(serviceCtx), ioSchedulerProvider.getIoScheduler(serviceCtx),
ioOpCallbackFactory, linearizeCmpFactory, rtreeFields, filterTypeTraits, filterCmpFactories,
- filterFields, true, isPointMBR, metadataPageManagerFactory);
+ filterFields, durable, isPointMBR, metadataPageManagerFactory);
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
index 152b0a8..aac8905 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/AbstractLSMRTree.java
@@ -127,9 +127,9 @@
ILinearizeComparatorFactory linearizer, int[] comparatorFields, IBinaryComparatorFactory[] linearizerArray,
double bloomFilterFalsePositiveRate, ILSMMergePolicy mergePolicy, ILSMOperationTracker opTracker,
ILSMIOOperationScheduler ioScheduler, ILSMIOOperationCallbackFactory ioOpCallbackFactory, boolean durable,
- boolean isPointMBR) {
+ boolean isPointMBR, ITracer tracer) {
super(ioManager, diskBufferCache, fileManager, bloomFilterFalsePositiveRate, mergePolicy, opTracker,
- ioScheduler, ioOpCallbackFactory, componentFactory, componentFactory, durable);
+ ioScheduler, ioOpCallbackFactory, componentFactory, componentFactory, durable, tracer);
this.rtreeInteriorFrameFactory = rtreeInteriorFrameFactory;
this.rtreeLeafFrameFactory = rtreeLeafFrameFactory;
this.btreeInteriorFrameFactory = btreeInteriorFrameFactory;
@@ -231,9 +231,9 @@
@Override
protected LSMRTreeOpContext createOpContext(IModificationOperationCallback modCallback,
ISearchOperationCallback searchCallback) {
- return new LSMRTreeOpContext(memoryComponents, rtreeLeafFrameFactory, rtreeInteriorFrameFactory,
- btreeLeafFrameFactory, modCallback, searchCallback, getTreeFields(), getFilterFields(), getLsmHarness(),
- comparatorFields, linearizerArray, getFilterCmpFactories());
+ return new LSMRTreeOpContext(this, memoryComponents, rtreeLeafFrameFactory, rtreeInteriorFrameFactory,
+ btreeLeafFrameFactory, modCallback, searchCallback, getTreeFields(), getFilterFields(), getHarness(),
+ comparatorFields, linearizerArray, getFilterCmpFactories(), tracer);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
index 9487a0d..6f61935 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTree.java
@@ -41,6 +41,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMDiskComponentFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperation.LSMIOOperationType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationCallbackFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
@@ -50,17 +51,17 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMOperationTracker;
import org.apache.hyracks.storage.am.lsm.common.api.ITwoPCIndex;
-import org.apache.hyracks.storage.am.lsm.common.api.LSMOperationType;
import org.apache.hyracks.storage.am.lsm.common.impls.BlockingIOOperationCallbackWrapper;
import org.apache.hyracks.storage.am.lsm.common.impls.ExternalIndexHarness;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMComponentFileReferences;
import org.apache.hyracks.storage.am.rtree.impls.SearchPredicate;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.util.trace.ITracer;
/**
* This is an lsm r-tree that does not have memory component and is modified
@@ -89,18 +90,18 @@
int[] comparatorFields, IBinaryComparatorFactory[] linearizerArray, ILSMMergePolicy mergePolicy,
ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
ILSMIOOperationCallbackFactory ioOpCallbackFactory, int[] buddyBTreeFields, boolean durable,
- boolean isPointMBR) {
+ boolean isPointMBR, ITracer tracer) {
super(ioManager, rtreeInteriorFrameFactory, rtreeLeafFrameFactory, btreeInteriorFrameFactory,
btreeLeafFrameFactory, diskBufferCache, fileNameManager, componentFactory, bloomFilterFalsePositiveRate,
rtreeCmpFactories, btreeCmpFactories, linearizer, comparatorFields, linearizerArray, mergePolicy,
- opTracker, ioScheduler, ioOpCallbackFactory, buddyBTreeFields, durable, isPointMBR);
+ opTracker, ioScheduler, ioOpCallbackFactory, buddyBTreeFields, durable, isPointMBR, tracer);
this.secondDiskComponents = new LinkedList<>();
this.fieldCount = fieldCount;
}
@Override
- public ExternalIndexHarness getLsmHarness() {
- return (ExternalIndexHarness) super.getLsmHarness();
+ public ExternalIndexHarness getHarness() {
+ return (ExternalIndexHarness) super.getHarness();
}
// The subsume merged components is overridden to account for:
@@ -207,7 +208,7 @@
diskComponents.add(component);
secondDiskComponents.add(component);
}
- getLsmHarness().indexFirstTimeActivated();
+ getHarness().indexFirstTimeActivated();
} else {
// This index has been opened before or is brand new with no components
// components. It should also maintain the version pointer
@@ -328,7 +329,7 @@
if (flushOnExit) {
BlockingIOOperationCallbackWrapper cb = new BlockingIOOperationCallbackWrapper(ioOpCallback);
- cb.afterFinalize(LSMOperationType.FLUSH, null);
+ cb.afterFinalize(LSMIOOperationType.FLUSH, null);
}
for (ILSMDiskComponent c : diskComponents) {
@@ -349,7 +350,7 @@
if (!isActive) {
throw new HyracksDataException("Failed to clear the index since it is not activated.");
}
- getLsmHarness().indexClear();
+ getHarness().indexClear();
for (ILSMDiskComponent c : diskComponents) {
c.deactivateAndDestroy();
@@ -532,7 +533,7 @@
component.markAsValid(durable);
component.deactivate();
} else {
- getLsmHarness().addBulkLoadedComponent(component);
+ getHarness().addBulkLoadedComponent(component);
}
}
}
@@ -587,7 +588,7 @@
LSMComponentFileReferences relMergeFileRefs =
getMergeFileReferences((ILSMDiskComponent) mergingComponents.get(0),
(ILSMDiskComponent) mergingComponents.get(mergingComponents.size() - 1));
- ILSMIndexAccessor accessor = new LSMRTreeAccessor(getLsmHarness(), rctx, buddyBTreeFields);
+ ILSMIndexAccessor accessor = new LSMRTreeAccessor(getHarness(), rctx, buddyBTreeFields);
// create the merge operation.
LSMRTreeMergeOperation mergeOp = new LSMRTreeMergeOperation(accessor, cursor,
relMergeFileRefs.getInsertIndexFileReference(), relMergeFileRefs.getDeleteIndexFileReference(),
@@ -598,23 +599,23 @@
@Override
public ILSMIndexAccessor createAccessor(ISearchOperationCallback searchCallback, int targetIndexVersion)
throws HyracksDataException {
- return new LSMRTreeAccessor(getLsmHarness(), createOpContext(searchCallback, targetIndexVersion),
+ return new LSMRTreeAccessor(getHarness(), createOpContext(searchCallback, targetIndexVersion),
buddyBTreeFields);
}
// This method creates the appropriate opContext for the targeted version
public ExternalRTreeOpContext createOpContext(ISearchOperationCallback searchCallback, int targetVersion) {
- return new ExternalRTreeOpContext(rtreeCmpFactories, btreeCmpFactories, searchCallback, targetVersion,
- getLsmHarness(), comparatorFields, linearizerArray, rtreeLeafFrameFactory, rtreeInteriorFrameFactory,
- btreeLeafFrameFactory);
+ return new ExternalRTreeOpContext(this, rtreeCmpFactories, btreeCmpFactories, searchCallback, targetVersion,
+ getHarness(), comparatorFields, linearizerArray, rtreeLeafFrameFactory, rtreeInteriorFrameFactory,
+ btreeLeafFrameFactory, tracer);
}
// The accessor for disk only indexes don't use modification callback and
// always carry the target index version with them
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- return new LSMRTreeAccessor(getLsmHarness(), createOpContext(searchCallback, version), buddyBTreeFields);
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) {
+ return new LSMRTreeAccessor(getHarness(), createOpContext(iap.getSearchOperationCallback(), version),
+ buddyBTreeFields);
}
@Override
@@ -646,7 +647,7 @@
componentFileRefrences.getDeleteIndexFileReference(),
componentFileRefrences.getBloomFilterFileReference(), false);
}
- getLsmHarness().addTransactionComponents(component);
+ getHarness().addTransactionComponents(component);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTreeOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTreeOpContext.java
index 73be537..09237a3 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTreeOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/ExternalRTreeOpContext.java
@@ -21,9 +21,11 @@
import org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.hyracks.util.trace.ITracer;
public class ExternalRTreeOpContext extends AbstractLSMIndexOperationContext {
private MultiComparator bTreeCmp;
@@ -31,12 +33,13 @@
private final int targetIndexVersion;
private LSMRTreeCursorInitialState initialState;
- public ExternalRTreeOpContext(IBinaryComparatorFactory[] rtreeCmpFactories,
+ public ExternalRTreeOpContext(ILSMIndex index, IBinaryComparatorFactory[] rtreeCmpFactories,
IBinaryComparatorFactory[] btreeCmpFactories, ISearchOperationCallback searchCallback,
int targetIndexVersion, ILSMHarness lsmHarness, int[] comparatorFields,
IBinaryComparatorFactory[] linearizerArray, ITreeIndexFrameFactory rtreeLeafFrameFactory,
- ITreeIndexFrameFactory rtreeInteriorFrameFactory, ITreeIndexFrameFactory btreeLeafFrameFactory) {
- super(null, null, null, searchCallback, null);
+ ITreeIndexFrameFactory rtreeInteriorFrameFactory, ITreeIndexFrameFactory btreeLeafFrameFactory,
+ ITracer tracer) {
+ super(index, null, null, null, searchCallback, null, tracer);
this.targetIndexVersion = targetIndexVersion;
this.bTreeCmp = MultiComparator.create(btreeCmpFactories);
this.rTreeCmp = MultiComparator.create(rtreeCmpFactories);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
index b43c2e3..9712b7c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTree.java
@@ -34,7 +34,7 @@
import org.apache.hyracks.storage.am.common.api.IIndexOperationContext;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.common.tuples.DualTupleReference;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentFilterHelper;
@@ -59,11 +59,11 @@
import org.apache.hyracks.storage.am.rtree.impls.RTree.RTreeAccessor;
import org.apache.hyracks.storage.am.rtree.impls.RTreeSearchCursor;
import org.apache.hyracks.storage.am.rtree.impls.SearchPredicate;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexCursor;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.util.trace.ITracer;
public class LSMRTree extends AbstractLSMRTree {
protected final int[] buddyBTreeFields;
@@ -100,11 +100,11 @@
int[] comparatorFields, IBinaryComparatorFactory[] linearizerArray, ILSMMergePolicy mergePolicy,
ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
ILSMIOOperationCallbackFactory ioOpCallbackFactory, int[] buddyBTreeFields, boolean durable,
- boolean isPointMBR) {
+ boolean isPointMBR, ITracer tracer) {
super(ioManager, rtreeInteriorFrameFactory, rtreeLeafFrameFactory, btreeInteriorFrameFactory,
btreeLeafFrameFactory, diskBufferCache, fileNameManager, componentFactory, rtreeCmpFactories,
btreeCmpFactories, linearizer, comparatorFields, linearizerArray, bloomFilterFalsePositiveRate,
- mergePolicy, opTracker, ioScheduler, ioOpCallbackFactory, durable, isPointMBR);
+ mergePolicy, opTracker, ioScheduler, ioOpCallbackFactory, durable, isPointMBR, tracer);
this.buddyBTreeFields = buddyBTreeFields;
}
@@ -117,8 +117,8 @@
// The RTree should be renamed before the BTree.
// scan the memory RTree
- RTreeAccessor memRTreeAccessor = flushingComponent.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ RTreeAccessor memRTreeAccessor =
+ flushingComponent.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
RTreeSearchCursor rtreeScanCursor = memRTreeAccessor.createSearchCursor(false);
SearchPredicate rtreeNullPredicate = new SearchPredicate(null, null);
memRTreeAccessor.search(rtreeScanCursor, rtreeNullPredicate);
@@ -127,8 +127,8 @@
flushOp.getBTreeTarget(), flushOp.getBloomFilterTarget(), true);
//count the number of tuples in the buddy btree
- BTreeAccessor memBTreeAccessor = flushingComponent.getBuddyIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ BTreeAccessor memBTreeAccessor =
+ flushingComponent.getBuddyIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
RangePredicate btreeNullPredicate = new RangePredicate(null, null, true, true, null, null);
IIndexCursor btreeCountingCursor = memBTreeAccessor.createCountingSearchCursor();
memBTreeAccessor.search(btreeCountingCursor, btreeNullPredicate);
@@ -276,10 +276,9 @@
}
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- return new LSMRTreeAccessor(getLsmHarness(), createOpContext(modificationCallback, searchCallback),
- buddyBTreeFields);
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) {
+ return new LSMRTreeAccessor(getHarness(),
+ createOpContext(iap.getModificationCallback(), iap.getSearchOperationCallback()), buddyBTreeFields);
}
// This function is modified for R-Trees without antimatter tuples to allow buddy B-Tree to have only primary keys
@@ -323,7 +322,7 @@
protected ILSMIOOperation createFlushOperation(AbstractLSMIndexOperationContext opCtx,
LSMComponentFileReferences componentFileRefs, ILSMIOOperationCallback callback)
throws HyracksDataException {
- LSMRTreeAccessor accessor = new LSMRTreeAccessor(getLsmHarness(), opCtx, buddyBTreeFields);
+ LSMRTreeAccessor accessor = new LSMRTreeAccessor(getHarness(), opCtx, buddyBTreeFields);
return new LSMRTreeFlushOperation(accessor, componentFileRefs.getInsertIndexFileReference(),
componentFileRefs.getDeleteIndexFileReference(), componentFileRefs.getBloomFilterFileReference(),
callback, fileManager.getBaseDir().getAbsolutePath());
@@ -333,7 +332,7 @@
protected ILSMIOOperation createMergeOperation(AbstractLSMIndexOperationContext opCtx,
LSMComponentFileReferences mergeFileRefs, ILSMIOOperationCallback callback) throws HyracksDataException {
ITreeIndexCursor cursor = new LSMRTreeSortedCursor(opCtx, linearizer, buddyBTreeFields);
- ILSMIndexAccessor accessor = new LSMRTreeAccessor(getLsmHarness(), opCtx, buddyBTreeFields);
+ ILSMIndexAccessor accessor = new LSMRTreeAccessor(getHarness(), opCtx, buddyBTreeFields);
return new LSMRTreeMergeOperation(accessor, cursor, mergeFileRefs.getInsertIndexFileReference(),
mergeFileRefs.getDeleteIndexFileReference(), mergeFileRefs.getBloomFilterFileReference(), callback,
fileManager.getBaseDir().getAbsolutePath());
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
index 77219a2..2d2b548 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeAbstractCursor.java
@@ -29,6 +29,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType;
@@ -136,10 +137,8 @@
rtreeCursors[i].reset();
}
if (rtreeAccessors[i] == null) {
- rtreeAccessors[i] =
- rtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
- btreeAccessors[i] =
- btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ rtreeAccessors[i] = rtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
} else {
rtreeAccessors[i].reset(rtree, NoOpOperationCallback.INSTANCE);
btreeAccessors[i].reset(btree, NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeDeletedKeysBTreeMergeCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeDeletedKeysBTreeMergeCursor.java
index d20b1bd..df4e16e 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeDeletedKeysBTreeMergeCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeDeletedKeysBTreeMergeCursor.java
@@ -25,7 +25,7 @@
import org.apache.hyracks.storage.am.btree.impls.BTreeRangeSearchCursor;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexOperationContext;
import org.apache.hyracks.storage.am.lsm.common.impls.LSMIndexSearchCursor;
@@ -62,7 +62,7 @@
IBTreeLeafFrame leafFrame = (IBTreeLeafFrame) lsmInitialState.getBTreeLeafFrameFactory().createFrame();
rangeCursors[i] = new BTreeRangeSearchCursor(leafFrame, false);
BTree btree = ((LSMRTreeDiskComponent) component).getBuddyIndex();
- btreeAccessors[i] = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
btreeAccessors[i].search(rangeCursors[i], btreePredicate);
}
setPriorityQueueComparator();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java
index 74d9685..50f1961 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeOpContext.java
@@ -25,9 +25,11 @@
import org.apache.hyracks.storage.am.btree.impls.BTree;
import org.apache.hyracks.storage.am.btree.impls.BTreeOpContext;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.common.ophelpers.IndexOperation;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMHarness;
+import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndex;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMemoryComponent;
import org.apache.hyracks.storage.am.lsm.common.impls.AbstractLSMIndexOperationContext;
import org.apache.hyracks.storage.am.rtree.impls.RTree;
@@ -36,6 +38,7 @@
import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.MultiComparator;
+import org.apache.hyracks.util.trace.ITracer;
public final class LSMRTreeOpContext extends AbstractLSMIndexOperationContext {
@@ -49,12 +52,14 @@
private BTreeOpContext currentBTreeOpContext;
private LSMRTreeCursorInitialState searchInitialState;
- public LSMRTreeOpContext(List<ILSMMemoryComponent> mutableComponents, ITreeIndexFrameFactory rtreeLeafFrameFactory,
- ITreeIndexFrameFactory rtreeInteriorFrameFactory, ITreeIndexFrameFactory btreeLeafFrameFactory,
- IModificationOperationCallback modificationCallback, ISearchOperationCallback searchCallback,
- int[] rtreeFields, int[] filterFields, ILSMHarness lsmHarness, int[] comparatorFields,
- IBinaryComparatorFactory[] linearizerArray, IBinaryComparatorFactory[] filterComparatorFactories) {
- super(rtreeFields, filterFields, filterComparatorFactories, searchCallback, modificationCallback);
+ public LSMRTreeOpContext(ILSMIndex index, List<ILSMMemoryComponent> mutableComponents,
+ ITreeIndexFrameFactory rtreeLeafFrameFactory, ITreeIndexFrameFactory rtreeInteriorFrameFactory,
+ ITreeIndexFrameFactory btreeLeafFrameFactory, IModificationOperationCallback modificationCallback,
+ ISearchOperationCallback searchCallback, int[] rtreeFields, int[] filterFields, ILSMHarness lsmHarness,
+ int[] comparatorFields, IBinaryComparatorFactory[] linearizerArray,
+ IBinaryComparatorFactory[] filterComparatorFactories, ITracer tracer) {
+ super(index, rtreeFields, filterFields, filterComparatorFactories, searchCallback, modificationCallback,
+ tracer);
mutableRTreeAccessors = new RTree.RTreeAccessor[mutableComponents.size()];
mutableBTreeAccessors = new BTree.BTreeAccessor[mutableComponents.size()];
rtreeOpContexts = new RTreeOpContext[mutableComponents.size()];
@@ -65,11 +70,11 @@
mutableRTreeAccessors[i] = mutableComponent.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
NoOpOperationCallback.INSTANCE, allFields);
} else {
- mutableRTreeAccessors[i] = mutableComponent.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ mutableRTreeAccessors[i] =
+ mutableComponent.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
- mutableBTreeAccessors[i] = mutableComponent.getBuddyIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ mutableBTreeAccessors[i] =
+ mutableComponent.getBuddyIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
rtreeOpContexts[i] = mutableRTreeAccessors[i].getOpContext();
btreeOpContexts[i] = mutableBTreeAccessors[i].getOpContext();
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
index c8f601d..41e9b92 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuples.java
@@ -32,7 +32,7 @@
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.IComponentFilterHelper;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilterFrameFactory;
@@ -60,9 +60,8 @@
import org.apache.hyracks.storage.am.rtree.impls.RTree.RTreeAccessor;
import org.apache.hyracks.storage.am.rtree.impls.RTreeSearchCursor;
import org.apache.hyracks.storage.am.rtree.impls.SearchPredicate;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexCursor;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
import org.apache.hyracks.storage.common.ISearchPredicate;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
@@ -94,8 +93,8 @@
// read the file names when we open the tree.
// The RTree should be renamed before the BTree.
LSMRTreeMemoryComponent flushingComponent = (LSMRTreeMemoryComponent) flushOp.getFlushingComponent();
- RTreeAccessor memRTreeAccessor = flushingComponent.getIndex().createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ RTreeAccessor memRTreeAccessor =
+ flushingComponent.getIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
RTreeSearchCursor rtreeScanCursor = memRTreeAccessor.createSearchCursor(false);
SearchPredicate rtreeNullPredicate = new SearchPredicate(null, null);
memRTreeAccessor.search(rtreeScanCursor, rtreeNullPredicate);
@@ -124,8 +123,8 @@
}
// scan the memory BTree
- BTreeAccessor memBTreeAccessor = flushingComponent.getBuddyIndex()
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ BTreeAccessor memBTreeAccessor =
+ flushingComponent.getBuddyIndex().createAccessor(NoOpIndexAccessParameters.INSTANCE);
BTreeRangeSearchCursor btreeScanCursor = memBTreeAccessor.createSearchCursor(false);
RangePredicate btreeNullPredicate = new RangePredicate(null, null, true, true, null, null);
memBTreeAccessor.search(btreeScanCursor, btreeNullPredicate);
@@ -213,17 +212,16 @@
}
@Override
- public ILSMIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- LSMRTreeOpContext opCtx = createOpContext(modificationCallback, searchCallback);
- return new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
+ public ILSMIndexAccessor createAccessor(IIndexAccessParameters iap) {
+ LSMRTreeOpContext opCtx = createOpContext(iap.getModificationCallback(), iap.getSearchOperationCallback());
+ return new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
}
@Override
protected ILSMIOOperation createFlushOperation(AbstractLSMIndexOperationContext opCtx,
LSMComponentFileReferences componentFileRefs, ILSMIOOperationCallback callback)
throws HyracksDataException {
- ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
+ ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
return new LSMRTreeFlushOperation(accessor, componentFileRefs.getInsertIndexFileReference(), null, null,
callback, fileManager.getBaseDir().getAbsolutePath());
}
@@ -237,8 +235,8 @@
returnDeletedTuples = true;
}
ITreeIndexCursor cursor = new LSMRTreeWithAntiMatterTuplesSearchCursor(opCtx, returnDeletedTuples);
- ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getLsmHarness(), opCtx, cursorFactory);
- return new MergeOperation(accessor, mergeFileRefs.getInsertIndexFileReference(), callback,
- fileManager.getBaseDir().getAbsolutePath(), cursor);
+ ILSMIndexAccessor accessor = new LSMTreeIndexAccessor(getHarness(), opCtx, cursorFactory);
+ return new LSMRTreeMergeOperation(accessor, cursor, mergeFileRefs.getInsertIndexFileReference(), null, null,
+ callback, fileManager.getBaseDir().getAbsolutePath());
}
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
index 4abab53..2520eac 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/impls/LSMRTreeWithAntiMatterTuplesSearchCursor.java
@@ -27,7 +27,7 @@
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponent.LSMComponentType;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMComponentFilter;
@@ -108,9 +108,8 @@
(IRTreeLeafFrame) lsmInitialState.getRTreeLeafFrameFactory().createFrame());
btreeCursors[i] = new BTreeRangeSearchCursor(
(IBTreeLeafFrame) lsmInitialState.getBTreeLeafFrameFactory().createFrame(), false);
- btreeAccessors[i] = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
- mutableRTreeAccessors[i] =
- rtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ btreeAccessors[i] = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
+ mutableRTreeAccessors[i] = rtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
rangeCursors = new RTreeSearchCursor[numImmutableComponents];
@@ -122,8 +121,7 @@
(IRTreeInteriorFrame) lsmInitialState.getRTreeInteriorFrameFactory().createFrame(),
(IRTreeLeafFrame) lsmInitialState.getRTreeLeafFrameFactory().createFrame());
RTree rtree = ((LSMRTreeWithAntimatterDiskComponent) component).getIndex();
- immutableRTreeAccessors[j] =
- rtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ immutableRTreeAccessors[j] = rtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
immutableRTreeAccessors[j].search(rangeCursors[j], searchPred);
j++;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/utils/LSMRTreeUtils.java b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/utils/LSMRTreeUtils.java
index c9df11f..451b122 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/utils/LSMRTreeUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-lsm-rtree/src/main/java/org/apache/hyracks/storage/am/lsm/rtree/utils/LSMRTreeUtils.java
@@ -72,6 +72,7 @@
import org.apache.hyracks.storage.am.rtree.linearize.ZCurveIntComparatorFactory;
import org.apache.hyracks.storage.am.rtree.tuples.RTreeTypeAwareTupleWriterFactory;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
+import org.apache.hyracks.util.trace.ITracer;
public class LSMRTreeUtils {
public static LSMRTree createLSMTree(IIOManager ioManager, List<IVirtualBufferCache> virtualBufferCaches,
@@ -243,7 +244,7 @@
ILSMOperationTracker opTracker, ILSMIOOperationScheduler ioScheduler,
ILSMIOOperationCallbackFactory ioOpCallbackFactory, ILinearizeComparatorFactory linearizeCmpFactory,
int[] buddyBTreeFields, boolean durable, boolean isPointMBR,
- IMetadataPageManagerFactory freePageManagerFactory) throws HyracksDataException {
+ IMetadataPageManagerFactory freePageManagerFactory, ITracer tracer) throws HyracksDataException {
int keyFieldCount = rtreeCmpFactories.length;
int valueFieldCount = typeTraits.length - keyFieldCount;
@@ -290,7 +291,7 @@
btreeLeafFrameFactory, diskBufferCache, fileNameManager, componentFactory, bloomFilterFalsePositiveRate,
typeTraits.length, rtreeCmpFactories, btreeCmpFactories, linearizeCmpFactory, comparatorFields,
linearizerArray, mergePolicy, opTracker, ioScheduler, ioOpCallbackFactory, buddyBTreeFields, durable,
- isPointMBR);
+ isPointMBR, tracer);
}
public static ILinearizeComparatorFactory proposeBestLinearizer(ITypeTraits[] typeTraits, int numKeyFields)
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTree.java b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTree.java
index 750a2fa..1e71b7f 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTree.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-am-rtree/src/main/java/org/apache/hyracks/storage/am/rtree/impls/RTree.java
@@ -50,6 +50,7 @@
import org.apache.hyracks.storage.am.rtree.frames.RTreeNSMFrame;
import org.apache.hyracks.storage.am.rtree.frames.RTreeNSMInteriorFrame;
import org.apache.hyracks.storage.am.rtree.tuples.RTreeTypeAwareTupleWriter;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
import org.apache.hyracks.storage.common.IIndexCursor;
import org.apache.hyracks.storage.common.IModificationOperationCallback;
@@ -756,9 +757,8 @@
}
@Override
- public RTreeAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) {
- return new RTreeAccessor(this, modificationCallback, searchCallback);
+ public RTreeAccessor createAccessor(IIndexAccessParameters iap) {
+ return new RTreeAccessor(this, iap.getModificationCallback(), iap.getSearchOperationCallback());
}
public RTreeAccessor createAccessor(IModificationOperationCallback modificationCallback,
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndex.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndex.java
index 842ef25..816550b 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndex.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndex.java
@@ -100,14 +100,12 @@
* on the same {@link IIndex}.
*
* @returns IIndexAccessor an accessor for this {@link IIndex}
- * @param modificationCallback
- * the callback to be used for modification operations
- * @param searchCallback
- * the callback to be used for search operations
+ * @param iap
+ * an instance of the index access parameter class that contains modification callback,
+ * search operation callback, etc
* @throws HyracksDataException
*/
- IIndexAccessor createAccessor(IModificationOperationCallback modificationCallback,
- ISearchOperationCallback searchCallback) throws HyracksDataException;
+ IIndexAccessor createAccessor(IIndexAccessParameters iap) throws HyracksDataException;
/**
* TODO: Get rid of this method
diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.sqlpp b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexAccessParameters.java
similarity index 60%
copy from asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.sqlpp
copy to hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexAccessParameters.java
index 33c063d..a3745d0 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/queries_sqlpp/temp-dataset/scan-insert-persistent-to-temp/scan-insert-persistent-to-temp.5.query.sqlpp
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/IIndexAccessParameters.java
@@ -16,18 +16,28 @@
* specific language governing permissions and limitations
* under the License.
*/
-/*
- * Description : Port data from a temporary dataset into yet-another temporary dataset.
- * Both datasets have R-tree indexes.
- * Expected Result : Success
- * Date : March 27 2015
+
+package org.apache.hyracks.storage.common;
+
+import java.util.Map;
+
+/**
+ * Contains necessary parameters that are required to initialize an index accessor.
*/
+public interface IIndexAccessParameters {
-use test;
+ /**
+ * Gets the modification call back.
+ */
+ IModificationOperationCallback getModificationCallback();
+ /**
+ * Gets the search operation call back.
+ */
+ ISearchOperationCallback getSearchOperationCallback();
-select element {'id':o.id}
-from MyMiniData as o
-where test.`spatial-intersect`(o.point,test.`create-polygon`([0.0,1.0,0.0,4.0,12.0,4.0,12.0,1.0]))
-order by o.id
-;
+ /**
+ * Gets additional parameters.
+ */
+ Map<String, Object> getParameters();
+}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java
index b693c91..b4f364c 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/AsyncFIFOPageQueueManager.java
@@ -66,8 +66,8 @@
throw new HyracksDataException("Queue is closing");
}
} catch (InterruptedException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ Thread.currentThread().interrupt();
+ throw HyracksDataException.create(e);
}
}
}
@@ -113,7 +113,7 @@
}
}
- public void finishQueue() {
+ public void finishQueue() throws HyracksDataException {
if (writerThread == null) {
synchronized (this) {
if (writerThread == null) {
@@ -121,23 +121,20 @@
}
}
}
- if(DEBUG) System.out.println("[FIFO] Finishing Queue");
try {
//Dummy cached page to act as low water mark
CachedPage lowWater = new CachedPage();
- lowWater.setQueueInfo(new QueueInfo(true,false));
- synchronized(lowWater){
+ lowWater.setQueueInfo(new QueueInfo(true, false));
+ synchronized (lowWater) {
queue.put(lowWater);
- while(queue.contains(lowWater)){
- lowWater.wait();
+ while (queue.contains(lowWater)) {
+ lowWater.wait();
}
}
} catch (InterruptedException e) {
Thread.currentThread().interrupt();
- // TODO what do we do here?
- e.printStackTrace();
+ throw HyracksDataException.create(e);
}
- if(DEBUG) System.out.println("[FIFO] Queue finished");
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
index d0f4965..7167565 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/BufferCache.java
@@ -1379,7 +1379,7 @@
}
@Override
- public void finishQueue() {
+ public void finishQueue() throws HyracksDataException {
fifoWriter.finishQueue();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
index f3de1c1..1cbe404 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/DebugBufferCache.java
@@ -199,7 +199,7 @@
}
@Override
- public void finishQueue() {
+ public void finishQueue() throws HyracksDataException {
bufferCache.finishQueue();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
index 28801ea..8dccc4a 100644
--- a/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
+++ b/hyracks-fullstack/hyracks/hyracks-storage-common/src/main/java/org/apache/hyracks/storage/common/buffercache/IBufferCache.java
@@ -235,7 +235,7 @@
/**
* Flush the queued pages written through buffer cache FIFO queues
*/
- void finishQueue();
+ void finishQueue() throws HyracksDataException;
// TODO: remove the replication out of the buffer cache interface
/**
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractModificationOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractModificationOperationCallbackTest.java
index a9e82cf..1c81f68 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractModificationOperationCallbackTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractModificationOperationCallbackTest.java
@@ -23,6 +23,7 @@
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig;
import org.apache.hyracks.storage.common.IIndexAccessor;
@@ -61,7 +62,8 @@
@Test
public void modificationCallbackTest() throws Exception {
- IIndexAccessor accessor = index.createAccessor(cb, NoOpOperationCallback.INSTANCE);
+ IndexAccessParameters actx = new IndexAccessParameters(cb, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor accessor = index.createAccessor(actx);
isFoundNull = true;
for (int i = 0; i < AccessMethodTestsConfig.BTREE_NUM_TUPLES_TO_INSERT; i++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
index e30fd04..0323d1b 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/AbstractSearchOperationCallbackTest.java
@@ -32,6 +32,8 @@
import org.apache.hyracks.dataflow.common.data.accessors.ITupleReference;
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
@@ -92,7 +94,8 @@
public SearchTask() throws HyracksDataException {
this.cb = new SynchronizingSearchOperationCallback();
- this.accessor = index.createAccessor(NoOpOperationCallback.INSTANCE, cb);
+ IndexAccessParameters actx = new IndexAccessParameters(NoOpOperationCallback.INSTANCE, cb);
+ this.accessor = index.createAccessor(actx);
this.cursor = accessor.createSearchCursor(false);
this.predicate = new RangePredicate();
this.builder = new ArrayTupleBuilder(NUM_KEY_FIELDS);
@@ -208,7 +211,7 @@
private final ArrayTupleReference tuple;
public InsertionTask() throws HyracksDataException {
- this.accessor = index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ this.accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
this.builder = new ArrayTupleBuilder(NUM_KEY_FIELDS);
this.tuple = new ArrayTupleReference();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
index 925cf1e..fbd3950 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/btree/OrderedIndexExamplesTest.java
@@ -45,6 +45,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.TreeIndexDiskOrderScanCursor;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexBulkLoader;
@@ -100,8 +101,9 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
int numInserts = 10000;
for (int i = 0; i < numInserts; i++) {
int f0 = rnd.nextInt() % numInserts;
@@ -183,8 +185,9 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
String key = "111";
String data = "XXX";
@@ -264,8 +267,9 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
int numInserts = 10000;
for (int i = 0; i < 10000; i++) {
int f0 = rnd.nextInt() % 2000;
@@ -350,8 +354,9 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
// Max string length to be generated.
int maxLength = 10;
int numInserts = 10000;
@@ -433,8 +438,9 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
// Max string length to be generated.
int runs = 3;
for (int run = 0; run < runs; run++) {
@@ -546,8 +552,9 @@
if (LOGGER.isLoggable(Level.INFO)) {
LOGGER.info("Inserting into tree...");
}
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
int maxLength = 10;
@@ -652,8 +659,9 @@
LOGGER.info(ins + " tuples loaded in " + (end - start) + "ms");
}
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
// Build low key.
ArrayTupleBuilder lowKeyTb = new ArrayTupleBuilder(1);
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
index 825aa53..0291f41 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/AbstractIndexTestWorker.java
@@ -26,6 +26,7 @@
import org.apache.hyracks.storage.am.common.TestOperationSelector.TestOperation;
import org.apache.hyracks.storage.am.common.datagen.DataGenThread;
import org.apache.hyracks.storage.am.common.datagen.TupleBatch;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.IIndexAccessor;
import org.apache.hyracks.storage.common.IIndexCursor;
@@ -44,7 +45,9 @@
this.opSelector = opSelector;
this.numBatches = numBatches;
this.rnd = new Random();
- this.indexAccessor = index.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ this.indexAccessor = index.createAccessor(actx);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java
index 3e1c922..6ac02e1 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/common/IndexTestContext.java
@@ -25,6 +25,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleBuilder;
import org.apache.hyracks.dataflow.common.comm.io.ArrayTupleReference;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.common.IIndex;
import org.apache.hyracks.storage.common.IIndexAccessor;
@@ -40,7 +41,9 @@
throws HyracksDataException {
this.fieldSerdes = fieldSerdes;
this.index = index;
- this.indexAccessor = index.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ this.indexAccessor = index.createAccessor(actx);
this.tupleBuilder = filtered ? new ArrayTupleBuilder(fieldSerdes.length + 1)
: new ArrayTupleBuilder(fieldSerdes.length);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
index 5a11557..d6358e3 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/storage/am/rtree/AbstractRTreeExamplesTest.java
@@ -44,7 +44,8 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
import org.apache.hyracks.storage.am.common.api.ITreeIndexAccessor;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.TreeIndexDiskOrderScanCursor;
import org.apache.hyracks.storage.am.rtree.frames.RTreePolicyType;
import org.apache.hyracks.storage.am.rtree.impls.SearchPredicate;
@@ -149,8 +150,7 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
int numInserts = 10000;
for (int i = 0; i < numInserts; i++) {
int p1x = rnd.nextInt();
@@ -260,8 +260,9 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
int p1x = rnd.nextInt();
int p1y = rnd.nextInt();
@@ -399,8 +400,9 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
int p1x = rnd.nextInt();
int p1y = rnd.nextInt();
@@ -552,8 +554,7 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
int numInserts = 10000;
for (int i = 0; i < numInserts; i++) {
double p1x = rnd.nextDouble();
@@ -658,8 +659,7 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
int runs = 3;
for (int run = 0; run < runs; run++) {
@@ -828,8 +828,7 @@
LOGGER.info(numInserts + " tuples loaded in " + (end - start) + "ms");
}
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
// Build key.
ArrayTupleBuilder keyTb = new ArrayTupleBuilder(rtreeKeyFieldCount);
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java
index d3c34dd..e310385 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestJobletContext.java
@@ -26,6 +26,7 @@
import org.apache.hyracks.api.exceptions.HyracksException;
import org.apache.hyracks.api.io.FileReference;
import org.apache.hyracks.api.io.IIOManager;
+import org.apache.hyracks.api.job.IJobletEventListenerFactory;
import org.apache.hyracks.api.job.JobId;
import org.apache.hyracks.api.job.profiling.counters.ICounterContext;
import org.apache.hyracks.api.resources.IDeallocatable;
@@ -56,10 +57,15 @@
return frameManger.allocateFrame(bytes);
}
- ByteBuffer reallocateFrame(ByteBuffer tobeDeallocate, int newFrameSizeInBytes, boolean copyOldData) throws HyracksDataException {
+ ByteBuffer reallocateFrame(ByteBuffer tobeDeallocate, int newFrameSizeInBytes, boolean copyOldData)
+ throws HyracksDataException {
return frameManger.reallocateFrame(tobeDeallocate, newFrameSizeInBytes, copyOldData);
}
+ public IJobletEventListenerFactory getJobletEventListenerFactory() {
+ return null;
+ }
+
void deallocateFrames(int bytes) {
frameManger.deallocateFrames(bytes);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
index 3d13cf9..ac52573 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestTaskContext.java
@@ -163,6 +163,10 @@
}
@Override
+ public byte[] getJobParameter(byte[] name, int start, int length) {
+ return new byte[0];
+ }
+
public Set<JobFlag> getJobFlags() {
return EnumSet.noneOf(JobFlag.class);
}
diff --git a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestUtils.java b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestUtils.java
index c3d86e8..1814e85 100644
--- a/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-test-support/src/main/java/org/apache/hyracks/test/support/TestUtils.java
@@ -135,7 +135,7 @@
String ncId = ncNamePrefix + i;
String ncAddress = addressPrefix + i;
ncNameToNcInfos.put(ncId,
- new NodeControllerInfo(ncId, NodeStatus.ALIVE, new NetworkAddress(ncAddress, netPort),
+ new NodeControllerInfo(ncId, NodeStatus.ACTIVE, new NetworkAddress(ncAddress, netPort),
new NetworkAddress(ncAddress, dataPort), new NetworkAddress(ncAddress, messagingPort), 2));
}
return ncNameToNcInfos;
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
index 78231fd..0a714cf 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeSearchCursorTest.java
@@ -56,6 +56,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory;
import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory;
import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.common.MultiComparator;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
import org.junit.Assert;
@@ -107,8 +108,9 @@
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- ITreeIndexAccessor indexAccessor =
- btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = btree.createAccessor(actx);
// generate keys
int numKeys = 50;
@@ -183,8 +185,9 @@
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- ITreeIndexAccessor indexAccessor =
- btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = btree.createAccessor(actx);
// generate keys
int numKeys = 50;
@@ -256,8 +259,9 @@
ArrayTupleBuilder tupleBuilder = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- ITreeIndexAccessor indexAccessor =
- btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = btree.createAccessor(actx);
// generate keys
int numKeys = 50;
@@ -357,8 +361,9 @@
ITreeIndexCursor rangeCursor = new BTreeRangeSearchCursor(leafFrame, false);
RangePredicate rangePred = createRangePredicate(lowKey, highKey, lowKeyInclusive, highKeyInclusive);
- ITreeIndexAccessor indexAccessor =
- btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = btree.createAccessor(actx);
indexAccessor.search(rangeCursor, rangePred);
try {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java
index 905eda8..f2fab5a 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeStatsTest.java
@@ -54,6 +54,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory;
import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory;
import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.util.TreeIndexBufferCacheWarmup;
import org.apache.hyracks.storage.am.common.util.TreeIndexStats;
import org.apache.hyracks.storage.am.common.util.TreeIndexStatsGatherer;
@@ -125,8 +126,9 @@
accessor.reset(frame.getBuffer());
FrameTupleReference tuple = new FrameTupleReference();
- ITreeIndexAccessor indexAccessor =
- btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = btree.createAccessor(actx);
// 10000
for (int i = 0; i < 100000; i++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
index 77bd64a..062abae 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-btree-test/src/test/java/org/apache/hyracks/storage/am/btree/BTreeUpdateSearchTest.java
@@ -49,6 +49,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory;
import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory;
import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.common.buffercache.IBufferCache;
import org.junit.Test;
@@ -98,8 +99,9 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference insertTuple = new ArrayTupleReference();
- ITreeIndexAccessor indexAccessor =
- btree.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = btree.createAccessor(actx);
int numInserts = 10000;
for (int i = 0; i < numInserts; i++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java
index 805fbd6..ecf1f85 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeExamplesTest.java
@@ -34,6 +34,7 @@
import org.apache.hyracks.storage.am.btree.OrderedIndexExamplesTest;
import org.apache.hyracks.storage.am.common.TestOperationCallback;
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness;
import org.apache.hyracks.storage.am.lsm.btree.utils.LSMBTreeUtil;
import org.apache.hyracks.storage.common.IIndexAccessor;
@@ -110,8 +111,9 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(actx);
int numInserts = 10000;
for (int i = 0; i < numInserts; i++) {
int f0 = rnd.nextInt() % numInserts;
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
index fdf027e..1af6779 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeModificationOperationCallbackTest.java
@@ -22,6 +22,7 @@
import org.apache.hyracks.dataflow.common.utils.SerdeUtils;
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
import org.apache.hyracks.storage.am.btree.AbstractModificationOperationCallbackTest;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness;
import org.apache.hyracks.storage.am.lsm.btree.utils.LSMBTreeUtil;
@@ -68,7 +69,9 @@
@Override
@Test
public void modificationCallbackTest() throws Exception {
- ILSMIndexAccessor accessor = (ILSMIndexAccessor) index.createAccessor(cb, NoOpOperationCallback.INSTANCE);
+ IndexAccessParameters actx = new IndexAccessParameters(cb, NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor accessor = (ILSMIndexAccessor) index.createAccessor(actx);
+
BlockingIOOperationCallbackWrapper ioOpCallback =
new BlockingIOOperationCallbackWrapper(((ILSMIndex) index).getIOOperationCallback());
for (int j = 0; j < 2; j++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
index 5742c83..e108369 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeSearchOperationCallbackTest.java
@@ -30,6 +30,8 @@
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
import org.apache.hyracks.storage.am.btree.AbstractSearchOperationCallbackTest;
import org.apache.hyracks.storage.am.btree.impls.RangePredicate;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness;
import org.apache.hyracks.storage.am.lsm.btree.utils.LSMBTreeUtil;
@@ -101,7 +103,8 @@
public SearchTask() throws HyracksDataException {
this.cb = new SynchronizingSearchOperationCallback();
- this.accessor = index.createAccessor(NoOpOperationCallback.INSTANCE, cb);
+ IndexAccessParameters actx = new IndexAccessParameters(NoOpOperationCallback.INSTANCE, cb);
+ this.accessor = index.createAccessor(actx);
this.cursor = accessor.createSearchCursor(false);
this.predicate = new RangePredicate();
this.builder = new ArrayTupleBuilder(NUM_KEY_FIELDS);
@@ -219,7 +222,7 @@
private final ArrayTupleReference tuple;
public InsertionTask() throws HyracksDataException {
- this.accessor = index.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ this.accessor = index.createAccessor(NoOpIndexAccessParameters.INSTANCE);
this.builder = new ArrayTupleBuilder(NUM_KEY_FIELDS);
this.tuple = new ArrayTupleReference();
}
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
index 4d15821..8a1444e 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceScanDiskComponentsTest.java
@@ -46,6 +46,7 @@
import org.apache.hyracks.storage.am.common.IIndexTestContext;
import org.apache.hyracks.storage.am.common.TestOperationCallback;
import org.apache.hyracks.storage.am.common.api.ITreeIndexCursor;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig;
import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTree;
import org.apache.hyracks.storage.am.lsm.btree.tuples.LSMBTreeTupleReference;
@@ -361,8 +362,9 @@
Assert.assertEquals("Check disk components", 1, btree.getDiskComponents().size());
ILSMDiskComponent btreeComponent = btree.getDiskComponents().get(0);
- BTree.BTreeAccessor btreeAccessor = ((BTree) btreeComponent.getIndex())
- .createAccessor(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ IndexAccessParameters actx =
+ new IndexAccessParameters(TestOperationCallback.INSTANCE, TestOperationCallback.INSTANCE);
+ BTree.BTreeAccessor btreeAccessor = ((BTree) btreeComponent.getIndex()).createAccessor(actx);
ITreeIndexCursor cursor = btreeAccessor.createDiskOrderScanCursor();
try {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceTest.java
index 8b9b715..ccbaa9c 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/LSMBTreeUpdateInPlaceTest.java
@@ -29,6 +29,7 @@
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
import org.apache.hyracks.storage.am.btree.AbstractOperationCallbackTest;
import org.apache.hyracks.storage.am.common.api.IBTreeIndexTupleReference;
+import org.apache.hyracks.storage.am.common.impls.IndexAccessParameters;
import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig;
import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeTestHarness;
@@ -80,7 +81,8 @@
public void setup() throws Exception {
harness.setUp();
super.setup();
- accessor = index.createAccessor(cb, NoOpOperationCallback.INSTANCE);
+ IndexAccessParameters actx = new IndexAccessParameters(cb, NoOpOperationCallback.INSTANCE);
+ accessor = index.createAccessor(actx);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java
index 70a29db..8782565 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtree.java
@@ -60,6 +60,7 @@
private final List<ITestOpCallback> searchCallbacks = new ArrayList<>();
private final List<ITestOpCallback> flushCallbacks = new ArrayList<>();
private final List<ITestOpCallback> mergeCallbacks = new ArrayList<>();
+ private final List<ITestOpCallback> allocateComponentCallbacks = new ArrayList<>();
private volatile int numScheduledFlushes;
private volatile int numStartedFlushes;
@@ -171,7 +172,7 @@
@Override
public ILSMIndexAccessor createAccessor(AbstractLSMIndexOperationContext opCtx) {
- return new LSMTreeIndexAccessor(getLsmHarness(), opCtx, ctx -> new TestLsmBtreeSearchCursor(ctx, this));
+ return new LSMTreeIndexAccessor(getHarness(), opCtx, ctx -> new TestLsmBtreeSearchCursor(ctx, this));
}
public int getNumScheduledFlushes() {
@@ -257,4 +258,26 @@
public Semaphore getSearchSemaphore() {
return searchSemaphore;
}
+
+ public void addAllocateCallback(ITestOpCallback callback) {
+ synchronized (allocateComponentCallbacks) {
+ allocateComponentCallbacks.add(callback);
+ }
+ }
+
+ public void clearAllocateCallbacks() {
+ synchronized (allocateComponentCallbacks) {
+ allocateComponentCallbacks.clear();
+ }
+ }
+
+ @Override
+ public void allocateMemoryComponents() throws HyracksDataException {
+ super.allocateMemoryComponents();
+ synchronized (allocateComponentCallbacks) {
+ for (ITestOpCallback callback : allocateComponentCallbacks) {
+ callback(callback, null);
+ }
+ }
+ }
}
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtreeLocalResource.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtreeLocalResource.java
index d8dda71..47a8046 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtreeLocalResource.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/impl/TestLsmBtreeLocalResource.java
@@ -60,6 +60,7 @@
IIOManager ioManager = serviceCtx.getIoManager();
FileReference file = ioManager.resolve(path);
List<IVirtualBufferCache> vbcs = vbcProvider.getVirtualBufferCaches(serviceCtx, file);
+ ioOpCallbackFactory.initialize(serviceCtx);
return TestLsmBtreeUtil.createLSMTree(ioManager, vbcs, file, storageManager.getBufferCache(serviceCtx),
typeTraits, cmpFactories, bloomFilterKeyFields, bloomFilterFalsePositiveRate,
mergePolicyFactory.createMergePolicy(mergePolicyProperties, serviceCtx),
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java
index cc754c0..3307093 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/InMemoryBTreeRunner.java
@@ -36,7 +36,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexFrameFactory;
import org.apache.hyracks.storage.am.common.datagen.DataGenThread;
import org.apache.hyracks.storage.am.common.datagen.TupleBatch;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.common.freepage.VirtualFreePageManager;
import org.apache.hyracks.storage.am.lsm.common.impls.VirtualBufferCache;
import org.apache.hyracks.storage.common.buffercache.HeapBufferAllocator;
@@ -122,7 +122,7 @@
public BTreeThread(DataGenThread dataGen, BTree btree, int numBatches) {
this.dataGen = dataGen;
this.numBatches = numBatches;
- indexAccessor = btree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ indexAccessor = btree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java
index 43af9fa..a8e0aee 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-btree-test/src/test/java/org/apache/hyracks/storage/am/lsm/btree/perf/LSMTreeRunner.java
@@ -33,7 +33,7 @@
import org.apache.hyracks.control.nc.io.IOManager;
import org.apache.hyracks.storage.am.common.datagen.DataGenThread;
import org.apache.hyracks.storage.am.common.datagen.TupleBatch;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTree;
import org.apache.hyracks.storage.am.lsm.btree.utils.LSMBTreeUtil;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIOOperationScheduler;
@@ -170,7 +170,7 @@
public LSMTreeThread(DataGenThread dataGen, LSMBTree lsmTree, int numBatches) {
this.dataGen = dataGen;
this.numBatches = numBatches;
- lsmTreeAccessor = lsmTree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ lsmTreeAccessor = lsmTree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
}
@Override
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java
index e521b4b..2fd1dbc 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-common-test/src/test/java/org/apache/hyracks/storage/am/lsm/common/test/PrefixMergePolicyTest.java
@@ -35,8 +35,7 @@
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicy;
import org.apache.hyracks.storage.am.lsm.common.impls.PrefixMergePolicy;
-import org.apache.hyracks.storage.common.IModificationOperationCallback;
-import org.apache.hyracks.storage.common.ISearchOperationCallback;
+import org.apache.hyracks.storage.common.IIndexAccessParameters;
import org.junit.Assert;
import org.junit.Test;
import org.mockito.Mockito;
@@ -223,8 +222,7 @@
}).when(accessor).scheduleMerge(Mockito.any(ILSMIOOperationCallback.class),
Mockito.anyListOf(ILSMDiskComponent.class));
- Mockito.when(index.createAccessor(Mockito.any(IModificationOperationCallback.class),
- Mockito.any(ISearchOperationCallback.class))).thenReturn(accessor);
+ Mockito.when(index.createAccessor(Mockito.any(IIndexAccessParameters.class))).thenReturn(accessor);
return index;
}
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/LSMInvertedIndexMergeTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/LSMInvertedIndexMergeTest.java
index ca91ef4..4657109 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/LSMInvertedIndexMergeTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/LSMInvertedIndexMergeTest.java
@@ -22,7 +22,7 @@
import java.io.IOException;
import org.apache.hyracks.storage.am.common.datagen.TupleGenerator;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.invertedindex.common.AbstractInvertedIndexLoadTest;
@@ -45,8 +45,8 @@
IIndex invIndex = testCtx.getIndex();
invIndex.create();
invIndex.activate();
- ILSMIndexAccessor invIndexAccessor = (ILSMIndexAccessor) invIndex.createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor invIndexAccessor =
+ (ILSMIndexAccessor) invIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
for (int i = 0; i < maxTreesToMerge; i++) {
for (int j = 0; j < i; j++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/PartitionedLSMInvertedIndexMergeTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/PartitionedLSMInvertedIndexMergeTest.java
index f4ff9cd..584de0c 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/PartitionedLSMInvertedIndexMergeTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/PartitionedLSMInvertedIndexMergeTest.java
@@ -23,7 +23,7 @@
import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.storage.am.common.datagen.TupleGenerator;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.config.AccessMethodTestsConfig;
import org.apache.hyracks.storage.am.lsm.common.api.ILSMIndexAccessor;
import org.apache.hyracks.storage.am.lsm.invertedindex.common.AbstractInvertedIndexLoadTest;
@@ -47,8 +47,8 @@
IIndex invIndex = testCtx.getIndex();
invIndex.create();
invIndex.activate();
- ILSMIndexAccessor invIndexAccessor = (ILSMIndexAccessor) invIndex.createAccessor(NoOpOperationCallback.INSTANCE,
- NoOpOperationCallback.INSTANCE);
+ ILSMIndexAccessor invIndexAccessor =
+ (ILSMIndexAccessor) invIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
for (int i = 0; i < maxTreesToMerge; i++) {
for (int j = 0; j < i; j++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
index 0ff25b5..95c25d5 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-invertedindex-test/src/test/java/org/apache/hyracks/storage/am/lsm/invertedindex/util/LSMInvertedIndexTestUtils.java
@@ -54,7 +54,7 @@
import org.apache.hyracks.storage.am.common.datagen.PersonNameFieldValueGenerator;
import org.apache.hyracks.storage.am.common.datagen.SortedIntegerFieldValueGenerator;
import org.apache.hyracks.storage.am.common.datagen.TupleGenerator;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.tuples.PermutingTupleReference;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndex;
import org.apache.hyracks.storage.am.lsm.invertedindex.api.IInvertedIndexAccessor;
@@ -257,8 +257,8 @@
IInvertedIndex invIndex = (IInvertedIndex) testCtx.getIndex();
int tokenFieldCount = invIndex.getTokenTypeTraits().length;
int invListFieldCount = invIndex.getInvListTypeTraits().length;
- IInvertedIndexAccessor invIndexAccessor = (IInvertedIndexAccessor) invIndex
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IInvertedIndexAccessor invIndexAccessor =
+ (IInvertedIndexAccessor) invIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
IIndexCursor invIndexCursor = invIndexAccessor.createRangeSearchCursor();
MultiComparator tokenCmp = MultiComparator.create(invIndex.getTokenCmpFactories());
IBinaryComparatorFactory[] tupleCmpFactories =
@@ -490,8 +490,8 @@
int numDocQueries, int numRandomQueries, IInvertedIndexSearchModifier searchModifier, int[] scanCountArray)
throws IOException, HyracksDataException {
IInvertedIndex invIndex = testCtx.invIndex;
- IInvertedIndexAccessor accessor = (IInvertedIndexAccessor) invIndex
- .createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IInvertedIndexAccessor accessor =
+ (IInvertedIndexAccessor) invIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
IBinaryTokenizer tokenizer = testCtx.getTokenizerFactory().createTokenizer();
InvertedIndexSearchPredicate searchPred = new InvertedIndexSearchPredicate(tokenizer, searchModifier);
List<ITupleReference> documentCorpus = testCtx.getDocumentCorpus();
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/AbstractLSMRTreeExamplesTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/AbstractLSMRTreeExamplesTest.java
index 55aa2c2..aefa385 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/AbstractLSMRTreeExamplesTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-lsm-rtree-test/src/test/java/org/apache/hyracks/storage/am/lsm/rtree/AbstractLSMRTreeExamplesTest.java
@@ -34,7 +34,7 @@
import org.apache.hyracks.dataflow.common.utils.TupleUtils;
import org.apache.hyracks.storage.am.common.api.IPrimitiveValueProviderFactory;
import org.apache.hyracks.storage.am.common.api.ITreeIndex;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.rtree.AbstractRTreeExamplesTest;
import org.apache.hyracks.storage.am.rtree.frames.RTreePolicyType;
import org.apache.hyracks.storage.am.rtree.util.RTreeUtils;
@@ -121,8 +121,7 @@
}
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- IIndexAccessor indexAccessor =
- treeIndex.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ IIndexAccessor indexAccessor = treeIndex.createAccessor(NoOpIndexAccessParameters.INSTANCE);
int numInserts = 10000;
for (int i = 0; i < numInserts; i++) {
int p1x = rnd.nextInt();
diff --git a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java
index 31d54ae..d2cc96b 100644
--- a/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-tests/hyracks-storage-am-rtree-test/src/test/java/org/apache/hyracks/storage/am/rtree/RTreeSearchCursorTest.java
@@ -42,7 +42,7 @@
import org.apache.hyracks.storage.am.common.api.ITreeIndexMetadataFrameFactory;
import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrameFactory;
import org.apache.hyracks.storage.am.common.freepage.LinkedMetaDataPageManager;
-import org.apache.hyracks.storage.am.common.impls.NoOpOperationCallback;
+import org.apache.hyracks.storage.am.common.impls.NoOpIndexAccessParameters;
import org.apache.hyracks.storage.am.common.util.HashMultiSet;
import org.apache.hyracks.storage.am.rtree.api.IRTreeInteriorFrame;
import org.apache.hyracks.storage.am.rtree.api.IRTreeLeafFrame;
@@ -128,8 +128,7 @@
ArrayTupleBuilder tb = new ArrayTupleBuilder(fieldCount);
ArrayTupleReference tuple = new ArrayTupleReference();
- ITreeIndexAccessor indexAccessor =
- rtree.createAccessor(NoOpOperationCallback.INSTANCE, NoOpOperationCallback.INSTANCE);
+ ITreeIndexAccessor indexAccessor = rtree.createAccessor(NoOpIndexAccessParameters.INSTANCE);
int numInserts = 10000;
ArrayList<RTreeCheckTuple> checkTuples = new ArrayList<>();
for (int i = 0; i < numInserts; i++) {
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java
index 02bf41c..a6ed4c8 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/test/java/org/apache/hyracks/util/trace/TraceTest.java
@@ -49,8 +49,21 @@
return handler;
}
- private JsonNode validate(String line) throws IOException {
- return mapper.readTree(line);
+ public JsonNode validate(String line) throws IOException {
+ final JsonNode traceRecord = mapper.readTree(line);
+
+ Assert.assertTrue(traceRecord.has("ph"));
+
+ Assert.assertTrue(traceRecord.has("pid"));
+ Integer.parseInt(traceRecord.get("pid").asText());
+
+ Assert.assertTrue(traceRecord.has("tid"));
+ Long.parseLong(traceRecord.get("tid").asText());
+
+ Assert.assertTrue(traceRecord.has("ts"));
+ Long.parseLong(traceRecord.get("ts").asText());
+
+ return traceRecord;
}
@Test
@@ -58,6 +71,8 @@
final ByteArrayOutputStream os = new ByteArrayOutputStream();
final StreamHandler handler = redirectTraceLog(os);
+ // test with initial categories
+
TraceCategoryRegistry registry = new TraceCategoryRegistry();
long cat1 = registry.get("CAT1");
long cat2 = registry.get("CAT2");
@@ -72,8 +87,13 @@
String[] lines = os.toString().split("\n");
for (String line : lines) {
- Assert.assertFalse(validate(line).get("cat").equals("CAT3"));
+ final JsonNode traceRecord = validate(line);
+ Assert.assertEquals("i", traceRecord.get("ph").asText());
+ Assert.assertNotEquals("CAT3", traceRecord.get("cat").asText());
}
+
+ // test with modified categories
+
tracer.setCategories("CAT1", "CAT3");
os.reset();
@@ -82,9 +102,12 @@
tracer.instant("test3", cat3, ITracer.Scope.p, null);
handler.flush();
+
lines = os.toString().split("\n");
for (String line : lines) {
- Assert.assertFalse(validate(line).get("cat").equals("CAT2"));
+ final JsonNode traceRecord = validate(line);
+ Assert.assertEquals("i", traceRecord.get("ph").asText());
+ Assert.assertNotEquals("CAT2", validate(line).get("cat").asText());
}
}
}