This is an automated email from the ASF dual-hosted git repository.
ifesdjeen pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit 5e2a72d7cca2d0dcf4d415d43a2b2e32ca44c512
Merge: 23512cf 24de8e4
Author: Alex Petrov <oleksandr.pet...@gmail.com>
AuthorDate: Thu Feb 25 09:27:32 2021 +0100
Merge branch 'cassandra-3.11' into trunk
.../org/apache/cassandra/cql3/functions/JavaBasedUDFunction.java | 2 +-
src/java/org/apache/cassandra/cql3/functions/UDFunction.java | 9 +++++++--
2 files changed, 8 insertions(+), 3 deletions(-)
diff --cc src/java/org/apache/cassandra/cql3/functions/UDFunction.java
index d593a6a,c06980d..b62c18f
--- a/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
+++ b/src/java/org/apache/cassandra/cql3/functions/UDFunction.java
@@@ -729,16 -632,11 +729,16 @@@ public abstract class UDFunction extend
}
}
- if (updated)
- MigrationManager.announceNewFunction(this, true);
+ return typesDifferDeeply ? Optional.of(Difference.DEEP) :
Optional.empty();
+ }
+
+ @Override
+ public int hashCode()
+ {
+ return Objects.hashCode(name, Functions.typeHashCode(argTypes),
Functions.typeHashCode(returnType), returnType, language, body);
}
- static class UDFClassLoader extends ClassLoader
+ private static class UDFClassLoader extends ClassLoader
{
// insecureClassLoader is the C* class loader
static final ClassLoader insecureClassLoader =
Thread.currentThread().getContextClassLoader();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
