>From Hussain Towaileb <[email protected]>:
Hussain Towaileb has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19024 )
Change subject: Merge branch gerrit/trinity into gerrit/goldfish
......................................................................
Merge branch gerrit/trinity into gerrit/goldfish
Change-Id: I14251ec5e66e4ee48505b10783e1a7bd6ebf49c2
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexDatasource.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryPartitionDatasource.java
6 files changed, 37 insertions(+), 30 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/24/19024/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexDatasource.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexDatasource.java
index a6b7878..23fcf8c 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexDatasource.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexDatasource.java
@@ -42,36 +42,25 @@
private final IndexDataflowHelperFactory indexDataflowHelperFactory;
private final RecordDescriptor recDesc;
private final IBinaryComparatorFactory[] comparatorFactories;
-<<<<<<< HEAD (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
private final AlgebricksAbsolutePartitionConstraint constraint;
private final int[][] partitionsMap;
-=======
- private final AlgebricksAbsolutePartitionConstraint storageLocations;
private final Index index;
->>>>>>> BRANCH (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
public DumpIndexDatasource(INodeDomain domain, IndexDataflowHelperFactory
indexDataflowHelperFactory,
RecordDescriptor recDesc, IBinaryComparatorFactory[]
comparatorFactories,
-<<<<<<< HEAD (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
- AlgebricksAbsolutePartitionConstraint constraint, int[][]
partitionsMap) throws AlgebricksException {
-=======
- AlgebricksAbsolutePartitionConstraint storageLocations, Index
index) throws AlgebricksException {
->>>>>>> BRANCH (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
+ AlgebricksAbsolutePartitionConstraint constraint, int[][]
partitionsMap, Index index)
+ throws AlgebricksException {
super(DUMP_INDEX_DATASOURCE_ID, DumpIndexRewriter.DUMP_INDEX, domain);
this.indexDataflowHelperFactory = indexDataflowHelperFactory;
this.recDesc = recDesc;
this.comparatorFactories = comparatorFactories;
-<<<<<<< HEAD (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
this.constraint = constraint;
this.partitionsMap = partitionsMap;
-=======
- this.storageLocations = storageLocations;
this.index = index;
}
public Index getIndex() {
return index;
->>>>>>> BRANCH (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
}
@Override
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
index 940bf96..825d571 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/DumpIndexRewriter.java
@@ -89,15 +89,11 @@
(AlgebricksAbsolutePartitionConstraint)
partitioningProperties.getConstraints();
return new DumpIndexDatasource(context.getComputationNodeDomain(),
indexDataflowHelperFactory,
secondaryIndexHelper.getSecondaryRecDesc(),
secondaryIndexHelper.getSecondaryComparatorFactories(),
-<<<<<<< HEAD (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
- secondaryPartitionConstraint,
partitioningProperties.getComputeStorageMap());
+ secondaryPartitionConstraint,
partitioningProperties.getComputeStorageMap(), index);
}
@Override
protected boolean invalidArgs(List<Mutable<ILogicalExpression>> args) {
return args.size() < 3;
-=======
- secondaryPartitionConstraint, index);
->>>>>>> BRANCH (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
}
}
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryPartitionDatasource.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryPartitionDatasource.java
index 4d40ba6..4917b33 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryPartitionDatasource.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/QueryPartitionDatasource.java
@@ -20,6 +20,7 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
import org.apache.asterix.common.cluster.IClusterStateManager;
import org.apache.asterix.metadata.api.IDatasourceFunction;
@@ -68,6 +69,14 @@
this.storageLocations = storageLocations;
}
+ public Dataset getDatasource() {
+ return ds;
+ }
+
+ public int getPartitionNumber() {
+ return partitionNum;
+ }
+
@Override
protected void initSchemaType(IAType iType) {
ARecordType type = (ARecordType) iType;
@@ -128,4 +137,14 @@
return new DataSourceId(dataset.getDatabaseName(),
dataset.getDataverseName(), dataset.getDatasetName(),
new String[] { dataset.getDatasetName(),
QueryPartitionRewriter.QUERY_PARTITION.getName() });
}
+
+ @Override
+ public boolean sameFunctionDatasource(FunctionDataSource other) {
+ if (!Objects.equals(this.functionId, other.getFunctionId())) {
+ return false;
+ }
+ QueryPartitionDatasource that = (QueryPartitionDatasource) other;
+ return Objects.equals(this.ds, that.getDatasource())
+ && Objects.equals(this.partitionNum,
that.getPartitionNumber());
+ }
}
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
index d9c6aed..7762041 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/DataSource.java
@@ -167,10 +167,7 @@
List<LogicalVariable> minFilterVars, List<LogicalVariable>
maxFilterVars,
ITupleFilterFactory tupleFilterFactory, long outputLimit,
IOperatorSchema opSchema,
IVariableTypeEnvironment typeEnv, JobGenContext context,
JobSpecification jobSpec, Object implConfig,
-<<<<<<< HEAD (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
IProjectionFiltrationInfo projectionFiltrationInfo) throws
AlgebricksException;
-=======
- IProjectionInfo<?> projectionInfo) throws AlgebricksException;
@Override
public boolean sameAs(IDataSource<?> other) {
@@ -194,5 +191,4 @@
return true;
}
->>>>>>> BRANCH (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
}
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
index ebe77f5..b985d09 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/logical/visitors/IsomorphismOperatorVisitor.java
@@ -483,13 +483,6 @@
if (aop.getOperatorTag() != LogicalOperatorTag.DATASOURCESCAN) {
return Boolean.FALSE;
}
-<<<<<<< HEAD (7e7960 [ASTERIXDB-3503][EXT] Deltalake invalid type error code
chan)
- DataSourceScanOperator argScan = (DataSourceScanOperator) arg;
- boolean isomorphic =
op.getDataSource().getId().equals(argScan.getDataSource().getId())
- && op.getOutputLimit() == argScan.getOutputLimit()
- && Objects.equals(op.getProjectionFiltrationInfo(),
argScan.getProjectionFiltrationInfo());
-=======
->>>>>>> BRANCH (3f20e3 Merge branch gerrit/neo into gerrit/trinity)
DataSourceScanOperator argScan = (DataSourceScanOperator) arg;
IDataSource<?> dataSource = op.getDataSource();
@@ -500,7 +493,7 @@
}
isomorphic = op.getOutputLimit() == argScan.getOutputLimit()
- && Objects.equals(op.getProjectionInfo(),
argScan.getProjectionInfo());
+ && Objects.equals(op.getProjectionFiltrationInfo(),
argScan.getProjectionFiltrationInfo());
if (!isomorphic) {
return Boolean.FALSE;
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19024
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: goldfish
Gerrit-Change-Id: I14251ec5e66e4ee48505b10783e1a7bd6ebf49c2
Gerrit-Change-Number: 19024
Gerrit-PatchSet: 1
Gerrit-Owner: Hussain Towaileb <[email protected]>
Gerrit-MessageType: newchange
