>From Ali Alsuliman <[email protected]>:
Ali Alsuliman has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19903 )
Change subject: WIP: partitioning property
......................................................................
WIP: partitioning property
Change-Id: Ie53228de01e7980cd96b39523d8c20da3d188860
---
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSSingleTableDataGeneratorDatasource.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FunctionDataSource.java
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/DefaultNodeGroupDomain.java
M
asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSAllTablesDataGeneratorDatasource.java
M
asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/MetadataProvider.java
5 files changed, 13 insertions(+), 18 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/03/19903/1
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSAllTablesDataGeneratorDatasource.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSAllTablesDataGeneratorDatasource.java
index ac19b00..89d4120 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSAllTablesDataGeneratorDatasource.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSAllTablesDataGeneratorDatasource.java
@@ -70,7 +70,7 @@
@Override
protected AlgebricksAbsolutePartitionConstraint
getLocations(IClusterStateManager csm, MetadataProvider md) {
- return md.getDataPartitioningProvider().getClusterLocations();
+ return md.getClusterLocations();
}
@Override
diff --git
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSSingleTableDataGeneratorDatasource.java
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSSingleTableDataGeneratorDatasource.java
index 6551346..46a9303 100644
---
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSSingleTableDataGeneratorDatasource.java
+++
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/app/function/TPCDSSingleTableDataGeneratorDatasource.java
@@ -78,7 +78,7 @@
@Override
protected AlgebricksAbsolutePartitionConstraint
getLocations(IClusterStateManager csm, MetadataProvider md) {
- return md.getDataPartitioningProvider().getClusterLocations();
+ return md.getClusterLocations();
}
@Override
diff --git
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FunctionDataSource.java
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FunctionDataSource.java
index 2322e53..6508a38 100644
---
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FunctionDataSource.java
+++
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/declared/FunctionDataSource.java
@@ -127,7 +127,7 @@
AlgebricksAbsolutePartitionConstraint locations);
protected AlgebricksAbsolutePartitionConstraint
getLocations(IClusterStateManager csm, MetadataProvider md) {
- String[] sortedLocations =
md.getDataPartitioningProvider().getClusterLocations().getLocations();
+ String[] sortedLocations = md.getClusterLocations().getLocations();
return new AlgebricksAbsolutePartitionConstraint(
Arrays.stream(sortedLocations).distinct().toArray(String[]::new));
}
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 71f479f..941c8f7 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
@@ -25,7 +25,6 @@
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -1059,10 +1058,6 @@
return dataPartitioningProvider.getClusterLocations();
}
- public DataPartitioningProvider getDataPartitioningProvider() {
- return dataPartitioningProvider;
- }
-
public Pair<IOperatorDescriptor, AlgebricksPartitionConstraint>
buildExternalDataLookupRuntime(
JobSpecification jobSpec, Dataset dataset, int[] ridIndexes,
boolean retainInput,
IVariableTypeEnvironment typeEnv, IOperatorSchema opSchema,
JobGenContext context,
@@ -1880,10 +1875,8 @@
if (!(nodeDomain instanceof DefaultNodeGroupDomain inputDomain)) {
return null;
}
- String[] inputLocations = inputDomain.getSortedNodes();
AlgebricksAbsolutePartitionConstraint locations =
dataPartitioningProvider.getClusterLocations();
- String[] clusterLocations = locations.getLocations();
- if (!Arrays.equals(inputLocations, clusterLocations)) {
+ if (!inputDomain.sameAs(new DefaultNodeGroupDomain(locations))) {
return null;
}
return dataPartitioningProvider.getPartitionsMap();
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/DefaultNodeGroupDomain.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/DefaultNodeGroupDomain.java
index 5921eea..f785fec 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/DefaultNodeGroupDomain.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/properties/DefaultNodeGroupDomain.java
@@ -18,7 +18,6 @@
*/
package org.apache.hyracks.algebricks.core.algebra.properties;
-import java.util.Arrays;
import java.util.List;
import org.apache.commons.collections4.MultiSet;
@@ -73,10 +72,4 @@
public String[] getNodes() {
return nodes.toArray(new String[0]);
}
-
- public String[] getSortedNodes() {
- String[] sortedNodes = nodes.toArray(new String[0]);
- Arrays.sort(sortedNodes);
- return sortedNodes;
- }
}
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19903
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: ionic
Gerrit-Change-Id: Ie53228de01e7980cd96b39523d8c20da3d188860
Gerrit-Change-Number: 19903
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-MessageType: newchange
