>From Ali Alsuliman <[email protected]>:
Ali Alsuliman has uploaded this change for review. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19811 )
Change subject: Merge branch 'gerrit/trinity' into 'gerrit/ionic'
......................................................................
Merge branch 'gerrit/trinity' into 'gerrit/ionic'
Change-Id: I8d48ac8209669e079be938b382b16de03f00dd85
---
M
hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionCollection.java
M asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
M hyracks-fullstack/pom.xml
M
asterixdb/asterix-om/src/main/java/org/apache/asterix/om/functions/BuiltinFunctions.java
6 files changed, 28 insertions(+), 80 deletions(-)
git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb
refs/changes/11/19811/1
diff --git
a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
index f028a49..d216c2d 100644
--- a/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
+++ b/asterixdb/asterix-app/src/test/resources/runtimets/sqlpp_queries.xml
@@ -7540,13 +7540,13 @@
</compilation-unit>
</test-case>
<test-case FilePath="misc">
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
- <compilation-unit name="query-ASTERIXDB-3299">
- <output-dir compare="Text">query-ASTERIXDB-3299</output-dir>
-=======
<compilation-unit name="handle_error_fun">
<output-dir compare="Text">handle_error_fun</output-dir>
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
+ </compilation-unit>
+ </test-case>
+ <test-case FilePath="misc">
+ <compilation-unit name="query-ASTERIXDB-3299">
+ <output-dir compare="Text">query-ASTERIXDB-3299</output-dir>
</compilation-unit>
</test-case>
<test-case FilePath="misc">
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 3becef5..1250eb9 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
@@ -1296,7 +1296,6 @@
public static final FunctionIdentifier DECODE_DATAVERSE_NAME =
FunctionConstants.newAsterix("decode-dataverse-name", 1);
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
public static final FunctionIdentifier SERIALIZED_SIZE =
FunctionConstants.newAsterix("serialized-size", 1);
public static final FunctionIdentifier PUT_AUTOGENERATED_KEY =
@@ -1305,12 +1304,8 @@
public static final FunctionIdentifier ACCESS_FIELD =
FunctionConstants.newAsterix("access-field", 2);
public static final FunctionIdentifier ACCESS_NESTED_FIELD =
FunctionConstants.newAsterix("access-nested-field", 2);
-=======
- public static final FunctionIdentifier SERIALIZED_SIZE =
- new FunctionIdentifier(FunctionConstants.ASTERIX_NS,
"serialized-size", 1);
- public static final FunctionIdentifier IF_ERROR =
- new FunctionIdentifier(FunctionConstants.ASTERIX_NS, "if-error",
2);
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
+
+ public static final FunctionIdentifier IF_ERROR =
FunctionConstants.newAsterix("if-error", 2);
static {
// first, take care of Algebricks builtin functions
@@ -2166,13 +2161,9 @@
addFunction(DECODE_DATAVERSE_NAME,
OrderedListOfAStringTypeComputer.INSTANCE_NULLABLE, true);
addPrivateFunction(COLLECTION_TO_SEQUENCE,
CollectionToSequenceTypeComputer.INSTANCE, true);
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
addFunction(SERIALIZED_SIZE, AInt64TypeComputer.INSTANCE, true);
// used by CBO's internal sampling queries for determining projection
sizes
-=======
- addPrivateFunction(SERIALIZED_SIZE, AInt64TypeComputer.INSTANCE, true);
addPrivateFunction(IF_ERROR, AnyTypeComputer.INSTANCE, true);
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
// external lookup
addPrivateFunction(EXTERNAL_LOOKUP, AnyTypeComputer.INSTANCE, false);
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 12db892..f6ef58f 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
@@ -1361,11 +1361,8 @@
fc.add(DecodeDataverseNameDescriptor.FACTORY);
fc.add(RandomWithSeedDescriptor.FACTORY);
fc.add(SerializedSizeDescriptor.FACTORY);
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
fc.add(PutAutogeneratedKeyDescriptor.FACTORY);
-=======
fc.add(IfErrorDescriptor.FACTORY);
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
ServiceLoader.load(IFunctionRegistrant.class).iterator().forEachRemaining(c ->
c.register(fc));
return fc;
diff --git
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java
index f7ac57c..920f567 100644
---
a/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java
+++
b/hyracks-fullstack/algebricks/algebricks-core/src/main/java/org/apache/hyracks/algebricks/core/algebra/operators/physical/AbstractHashJoinPOperator.java
@@ -143,32 +143,15 @@
Set<LogicalVariable> firstDeliveredVars =
unorderedFirstDelivered.getColumnSet();
UnorderedPartitionedProperty
unorderedRequired =
(UnorderedPartitionedProperty)
requirements;
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
- Set<LogicalVariable> originalRequiredVars
= unorderedRequired.getColumnSet();
Set<LogicalVariable> modifiedRequiredVars
= new ListSet<>();
-=======
- Set<LogicalVariable> modifiedRequiredVars
= new ListSet<LogicalVariable>();
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
Map<LogicalVariable, EquivalenceClass>
eqmap = context.getEquivalenceClassMap(op);
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
Set<LogicalVariable> coveredVars = new
ListSet<>();
- List<LogicalVariable> keysFirst =
-
(keysRightBranch.containsAll(originalRequiredVars)) ? keysRightBranch
- : keysLeftBranch;
-=======
- Set<LogicalVariable> coveredVars = new
ListSet<LogicalVariable>();
List<LogicalVariable> keysFirst =
(keysRightBranch.containsAll(firstDeliveredVars))
? keysRightBranch : keysLeftBranch;
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
List<LogicalVariable> keysSecond =
keysFirst == keysRightBranch ?
keysLeftBranch : keysRightBranch;
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
- for (LogicalVariable r :
originalRequiredVars) {
- EquivalenceClass ecSnd = eqmap.get(r);
-=======
for (LogicalVariable r :
firstDeliveredVars) {
EquivalenceClass ecFirst =
eqmap.get(r);
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
boolean found = false;
int j = 0;
for (LogicalVariable rvar : keysFirst)
{
@@ -184,27 +167,13 @@
+ " among " + keysFirst);
}
LogicalVariable v2 = keysSecond.get(j);
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
- EquivalenceClass ecFst = eqmap.get(v2);
- for (LogicalVariable vset1 :
firstDeliveredVars) {
- if (vset1 == v2 || ecFst != null
&& eqmap.get(vset1) == ecFst) {
- if (!coveredVars.add(vset1)) {
- continue;
- }
- modifiedRequiredVars.add(r);
- break;
- }
- }
-=======
coveredVars.add(r);
modifiedRequiredVars.add(v2);
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
if
(coveredVars.equals(firstDeliveredVars)) {
break;
}
}
if
(!coveredVars.equals(firstDeliveredVars)) {
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
throw new AlgebricksException(
"Could not modify the original
required partitioning " + requirements
+ " to agree with the
partitioning property "
@@ -212,13 +181,7 @@
+ " delivered by
previous input operator. Covered vars: "
+ coveredVars + ".
Modified required vars: "
+
modifiedRequiredVars);
-=======
- throw new AlgebricksException("Could
not modify " + requirements
- + " to agree with partitioning
property " + firstDeliveredPartitioning
- + " delivered by previous
input operator.");
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
UnorderedPartitionedProperty
unorderedFinalRequired;
if (unorderedRequired.usesPartitionsMap())
{
unorderedFinalRequired =
UnorderedPartitionedProperty.ofPartitionsMap(
@@ -229,11 +192,6 @@
unorderedRequired.getNodeDomain());
}
return new Pair<>(false,
unorderedFinalRequired);
-=======
- UnorderedPartitionedProperty upp2 = new
UnorderedPartitionedProperty(
- modifiedRequiredVars,
requirements.getNodeDomain());
- return new Pair<>(false, upp2);
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
}
case ORDERED_PARTITIONED: {
throw new NotImplementedException();
diff --git a/hyracks-fullstack/pom.xml b/hyracks-fullstack/pom.xml
index e3000cd..aa1f8a2 100644
--- a/hyracks-fullstack/pom.xml
+++ b/hyracks-fullstack/pom.xml
@@ -75,14 +75,10 @@
<snappy.version>1.1.10.5</snappy.version>
<jackson.version>2.14.3</jackson.version>
<jackson-databind.version>${jackson.version}</jackson-databind.version>
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
- <netty.version>4.1.118.Final</netty.version>
+ <netty.version>4.1.121.Final</netty.version>
<asm.version>9.3</asm.version>
<awsjavasdk.version>2.29.27</awsjavasdk.version>
<gcsjavasdk.version>2.45.0</gcsjavasdk.version>
-=======
- <netty.version>4.1.121.Final</netty.version>
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
<implementation.title>Apache Hyracks and Algebricks -
${project.name}</implementation.title>
<implementation.url>https://asterixdb.apache.org/</implementation.url>
@@ -252,20 +248,6 @@
<version>${netty.version}</version>
</dependency>
<dependency>
-<<<<<<< HEAD (268439 [ASTERIXDB-3392] Improve logging on copy to parquet)
- <groupId>io.netty</groupId>
- <artifactId>netty-transport-native-unix-common</artifactId>
- <version>${netty.version}</version>
- </dependency>
- <dependency>
- <groupId>io.netty</groupId>
- <artifactId>netty-all</artifactId>
- <version>${netty.version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
-=======
->>>>>>> BRANCH (32007c Merge branch 'gerrit/neo' into 'gerrit/trinity')
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.13.2</version>
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/19811
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: I8d48ac8209669e079be938b382b16de03f00dd85
Gerrit-Change-Number: 19811
Gerrit-PatchSet: 1
Gerrit-Owner: Ali Alsuliman <[email protected]>
Gerrit-MessageType: newchange
