>From Michael Blow <[email protected]>:
Michael Blow has submitted this change. (
https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18256 )
Change subject: Merge branch 'gerrit/neo' into 'gerrit/trinity'
......................................................................
Merge branch 'gerrit/neo' into 'gerrit/trinity'
Change-Id: I312b65d84030f7f4557bec637f966d2003aa17a4
---
M
asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionTypeInferers.java
2 files changed, 18 insertions(+), 5 deletions(-)
Approvals:
Jenkins: Verified
Michael Blow: Looks good to me, approved; Verified
diff --git
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionTypeInferers.java
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionTypeInferers.java
index e5d03c9..9c25f6e 100644
---
a/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionTypeInferers.java
+++
b/asterixdb/asterix-runtime/src/main/java/org/apache/asterix/runtime/functions/FunctionTypeInferers.java
@@ -116,7 +116,9 @@
}
};
-<<<<<<< HEAD (f805cf [ASTERIXDB-3343][API] Include job details in
active/complete)
+ public static final IFunctionTypeInferer MEDIAN_MEMORY =
+ (expr, fd, context, compilerProps) ->
fd.setImmutableStates(compilerProps.getSortMemoryFrames());
+
public static final IFunctionTypeInferer RECORD_MODIFY_INFERER = (expr,
fd, context, compilerProps) -> {
AbstractFunctionCallExpression f = (AbstractFunctionCallExpression)
expr;
IAType outType = (IAType) context.getType(expr);
@@ -126,10 +128,6 @@
}
fd.setImmutableStates(outType, inType);
};
-=======
- public static final IFunctionTypeInferer MEDIAN_MEMORY =
- (expr, fd, context, compilerProps) ->
fd.setImmutableStates(compilerProps.getSortMemoryFrames());
->>>>>>> BRANCH (ed4bd1 [ASTERIXDB-3388][DOC]: Add ARRAY_MEDIAN() Function)
public static final class CastTypeInferer implements IFunctionTypeInferer {
@Override
--
To view, visit https://asterix-gerrit.ics.uci.edu/c/asterixdb/+/18256
To unsubscribe, or for help writing mail filters, visit
https://asterix-gerrit.ics.uci.edu/settings
Gerrit-Project: asterixdb
Gerrit-Branch: trinity
Gerrit-Change-Id: I312b65d84030f7f4557bec637f966d2003aa17a4
Gerrit-Change-Number: 18256
Gerrit-PatchSet: 1
Gerrit-Owner: Michael Blow <[email protected]>
Gerrit-Reviewer: Jenkins <[email protected]>
Gerrit-Reviewer: Michael Blow <[email protected]>
Gerrit-MessageType: merged
