This is an automated email from the ASF dual-hosted git repository.
mhubail pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/asterixdb.git
The following commit(s) were added to refs/heads/master by this push:
new b1b7d4f0cd [ASTERIXDB-3227][COMP] Refactor QueryTranslator
doCreateDatasetStatement()
b1b7d4f0cd is described below
commit b1b7d4f0cd36a6bd5c602064cf4b1b65d3652d3c
Author: Ritik Raj <[email protected]>
AuthorDate: Tue Jul 18 21:37:15 2023 +0530
[ASTERIXDB-3227][COMP] Refactor QueryTranslator doCreateDatasetStatement()
- user model changes: no
- storage format changes: no
- interface changes: no
This small patch extracts dataset object creation in function
getDataset(..) out of
doCreateDatasetStatement(..)
Change-Id: I7da017d4bf1c56381033e5c07cb6f094bbd22aca
Reviewed-on: https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/17648
Integration-Tests: Jenkins <[email protected]>
Reviewed-by: Hussain Towaileb <[email protected]>
Tested-by: Hussain Towaileb <[email protected]>
---
.../asterix/app/translator/QueryTranslator.java | 20 ++++++++++++++++----
1 file changed, 16 insertions(+), 4 deletions(-)
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 dc165a07fa..f390237072 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
@@ -90,6 +90,7 @@ import
org.apache.asterix.common.functions.ExternalFunctionLanguage;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.common.metadata.DatasetFullyQualifiedName;
import org.apache.asterix.common.metadata.DataverseName;
+import org.apache.asterix.common.metadata.IDataset;
import org.apache.asterix.common.metadata.IMetadataLockUtil;
import org.apache.asterix.common.utils.JobUtils;
import org.apache.asterix.common.utils.JobUtils.ProgressState;
@@ -886,10 +887,9 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
}
// #. add a new dataset with PendingAddOp
- dataset = new Dataset(dataverseName, datasetName,
itemTypeDataverseName, itemTypeName,
- metaItemTypeDataverseName, metaItemTypeName, ngName,
compactionPolicy, compactionPolicyProperties,
- datasetDetails, dd.getHints(), dsType,
DatasetIdFactory.generateDatasetId(),
- MetadataUtil.PENDING_ADD_OP, compressionScheme,
datasetFormatInfo);
+ dataset = (Dataset) createDataset(dd, dataverseName, datasetName,
itemTypeDataverseName, itemTypeName,
+ metaItemTypeDataverseName, metaItemTypeName, dsType,
compactionPolicy, compactionPolicyProperties,
+ compressionScheme, datasetFormatInfo, datasetDetails,
ngName);
MetadataManager.INSTANCE.addDataset(metadataProvider.getMetadataTxnContext(),
dataset);
if (itemTypeIsInline) {
@@ -981,6 +981,18 @@ public class QueryTranslator extends
AbstractLangTranslator implements IStatemen
return Optional.of(dataset);
}
+ protected IDataset createDataset(DatasetDecl dd, DataverseName
dataverseName, String datasetName,
+ DataverseName itemTypeDataverseName, String itemTypeName,
DataverseName metaItemTypeDataverseName,
+ String metaItemTypeName, DatasetType dsType, String
compactionPolicy,
+ Map<String, String> compactionPolicyProperties, String
compressionScheme,
+ DatasetFormatInfo datasetFormatInfo, IDatasetDetails
datasetDetails, String ngName)
+ throws AlgebricksException {
+ return new Dataset(dataverseName, datasetName, itemTypeDataverseName,
itemTypeName, metaItemTypeDataverseName,
+ metaItemTypeName, ngName, compactionPolicy,
compactionPolicyProperties, datasetDetails, dd.getHints(),
+ dsType, DatasetIdFactory.generateDatasetId(),
MetadataUtil.PENDING_ADD_OP, compressionScheme,
+ datasetFormatInfo);
+ }
+
protected Triple<DataverseName, String, Boolean>
extractDatasetItemTypeName(DataverseName datasetDataverseName,
String datasetName, TypeExpression itemTypeExpr, boolean
isMetaItemType, SourceLocation sourceLoc)
throws CompilationException {