>From <[email protected]>:
[email protected] has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18226 )
Change subject: [ASTERIXDB-3370][COMP] Fix naming for accessed entities
......................................................................
[ASTERIXDB-3370][COMP] Fix naming for accessed entities
- user model changes: no
- storage format changes: no
- interface changes: no
Change-Id: Ic3b1898307f7099dba3ea135db6c2e794de27bde
---
M
asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppLoadAccessedDataset.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
3 files changed, 24 insertions(+), 35 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/26/18226/1
diff --git
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppLoadAccessedDataset.java
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppLoadAccessedDataset.java
index 355b484..f2e18d8 100644
---
a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppLoadAccessedDataset.java
+++
b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/rewrites/visitor/SqlppLoadAccessedDataset.java
@@ -19,18 +19,14 @@
package org.apache.asterix.lang.sqlpp.rewrites.visitor;
import java.util.List;
-import java.util.Map;
import org.apache.asterix.common.exceptions.AsterixException;
-import org.apache.asterix.common.exceptions.CompilationException;
import org.apache.asterix.common.functions.FunctionSignature;
import org.apache.asterix.common.metadata.DataverseName;
import org.apache.asterix.lang.common.base.Expression;
import org.apache.asterix.lang.common.base.ILangExpression;
import org.apache.asterix.lang.common.expression.CallExpr;
import org.apache.asterix.lang.common.rewrites.LangRewritingContext;
-import org.apache.asterix.lang.common.statement.CopyToStatement;
-import org.apache.asterix.lang.common.statement.ExternalDetailsDecl;
import org.apache.asterix.lang.common.util.ExpressionUtils;
import
org.apache.asterix.lang.sqlpp.visitor.base.AbstractSqlppSimpleExpressionVisitor;
import org.apache.asterix.metadata.entities.EntityDetails;
@@ -45,25 +41,6 @@
}
@Override
- public Expression visit(CopyToStatement stmtCopy, ILangExpression arg)
throws CompilationException {
- ExternalDetailsDecl externalDetailsDecl =
stmtCopy.getExternalDetailsDecl();
- Map<String, String> properties = externalDetailsDecl.getProperties();
- String databaseName = properties.getOrDefault("database", "Default");
- String dataverseNameString = properties.getOrDefault("dataverse",
"Default");
- String linkName = properties.getOrDefault("name", "");
- DataverseName dataverseName;
- try {
- dataverseName =
DataverseName.createFromCanonicalForm(dataverseNameString);
- } catch (AsterixException e) {
- throw new IllegalStateException(e);
- }
-
- context.getMetadataProvider().addAccessedEntity(
- new EntityDetails(databaseName, dataverseName, linkName,
EntityDetails.EntityType.LINK));
- return super.visit(stmtCopy, arg);
- }
-
- @Override
public Expression visit(CallExpr expression, ILangExpression arg) {
if
(BuiltinFunctions.DATASET.equals(expression.getFunctionSignature().createFunctionIdentifier()))
{
List<Expression> exprs = expression.getExprList();
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 6ec29da..e0f44ea 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
@@ -204,7 +204,7 @@
private final INamespaceResolver namespaceResolver;
private IDataFormat dataFormat = FormatUtils.getDefaultFormat();
- private final Set<EntityDetails> getAccessedEntities;
+ private final Set<EntityDetails> accessedEntities;
public static MetadataProvider
createWithDefaultNamespace(ICcApplicationContext appCtx) {
java.util.function.Function<ICcApplicationContext,
IMetadataProvider<?, ?>> factory =
@@ -231,7 +231,7 @@
dataPartitioningProvider = (DataPartitioningProvider)
appCtx.getDataPartitioningProvider();
locks = new LockList();
config = new HashMap<>();
- getAccessedEntities = new HashSet<>();
+ accessedEntities = new HashSet<>();
setDefaultNamespace(MetadataConstants.DEFAULT_NAMESPACE);
}
@@ -1953,11 +1953,11 @@
}
public void addAccessedEntity(EntityDetails entityDetails) {
- getAccessedEntities.add(entityDetails);
+ accessedEntities.add(entityDetails);
}
- public Set<EntityDetails> getGetAccessedEntities() {
- return Collections.unmodifiableSet(getAccessedEntities);
+ public Set<EntityDetails> getAccessedEntities() {
+ return Collections.unmodifiableSet(accessedEntities);
}
private void validateDatabaseObjectNameImpl(String name, SourceLocation
sourceLoc) throws AlgebricksException {
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
index c030176..a341a39 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/entities/EntityDetails.java
@@ -25,19 +25,18 @@
public enum EntityType {
DATASET,
VIEW,
- FUNCTION,
- LINK
+ FUNCTION
}
private final String databaseName;
private final DataverseName dataverseName;
- private final String datasetName;
+ private final String entityName;
private final EntityType entityType;
- public EntityDetails(String databaseName, DataverseName dataverseName,
String datasetName, EntityType entityType) {
+ public EntityDetails(String databaseName, DataverseName dataverseName,
String entityName, EntityType entityType) {
this.databaseName = databaseName;
this.dataverseName = dataverseName;
- this.datasetName = datasetName;
+ this.entityName = entityName;
this.entityType = entityType;
}
@@ -49,8 +48,8 @@
return dataverseName;
}
- public String getDatasetName() {
- return datasetName;
+ public String getEntityName() {
+ return entityName;
}
public EntityType getEntityType() {
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18226
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: master
Gerrit-Change-Id: Ic3b1898307f7099dba3ea135db6c2e794de27bde
Gerrit-Change-Number: 18226
Gerrit-PatchSet: 1
Gerrit-Owner: [email protected]
Gerrit-MessageType: newchange
