From f4419e664d565118ff6232d077a8694516ff073f Mon Sep 17 00:00:00 2001 From: jianfengmao Date: Fri, 15 Mar 2024 10:51:58 -0600 Subject: [PATCH] Fix spotless check errors --- .../table/impl/lang/QueryLanguageParser.java | 8 ++-- .../engine/util/PyCallableWrapperJpyImpl.java | 42 ++++++++++--------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java b/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java index e6a081297b5..e3e5fc50851 100644 --- a/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java +++ b/engine/table/src/main/java/io/deephaven/engine/table/impl/lang/QueryLanguageParser.java @@ -2786,10 +2786,10 @@ private void prepareVectorizationArgs( } // TODO related to core#709, but should be covered by PyCallableWrapper.verifyArguments, needs to verify -// if (!isSafelyCoerceable(argTypes[i], paramTypes.get(i))) { -// throw new PythonCallVectorizationFailure("Python vectorized function argument type mismatch: " + n + " " -// + argTypes[i].getSimpleName() + " -> " + paramTypes.get(i).getSimpleName()); -// } + // if (!isSafelyCoerceable(argTypes[i], paramTypes.get(i))) { + // throw new PythonCallVectorizationFailure("Python vectorized function argument type mismatch: " + n + " " + // + argTypes[i].getSimpleName() + " -> " + paramTypes.get(i).getSimpleName()); + // } } } diff --git a/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java b/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java index e7f7c977918..c3171176cc7 100644 --- a/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java +++ b/engine/table/src/main/java/io/deephaven/engine/util/PyCallableWrapperJpyImpl.java @@ -198,23 +198,24 @@ public void parseSignature() { throw new IllegalStateException("Signature should always be available."); } -// List> paramTypes = new ArrayList<>(); -// for (char numpyTypeChar : signatureString.toCharArray()) { -// if (numpyTypeChar != '-') { -// Class paramType = numpyType2JavaClass.get(numpyTypeChar); -// if (paramType == null) { -// throw new IllegalStateException( -// "Parameters of vectorized functions should always be of integral, floating point, boolean, String, or Object type: " -// + numpyTypeChar + " of " + signatureString); -// } -// paramTypes.add(paramType); -// } else { -// break; -// } -// } -// this.paramTypes = paramTypes; + // List> paramTypes = new ArrayList<>(); + // for (char numpyTypeChar : signatureString.toCharArray()) { + // if (numpyTypeChar != '-') { + // Class paramType = numpyType2JavaClass.get(numpyTypeChar); + // if (paramType == null) { + // throw new IllegalStateException( + // "Parameters of vectorized functions should always be of integral, floating point, boolean, String, or Object + // type: " + // + numpyTypeChar + " of " + signatureString); + // } + // paramTypes.add(paramType); + // } else { + // break; + // } + // } + // this.paramTypes = paramTypes; String pyEncodedParamsStr = signatureString.split("->")[0]; - if (!pyEncodedParamsStr.isEmpty()){ + if (!pyEncodedParamsStr.isEmpty()) { String[] pyEncodedParams = pyEncodedParamsStr.split(","); for (int i = 0; i < pyEncodedParams.length; i++) { String[] paramDetail = pyEncodedParams[i].split(":"); @@ -263,13 +264,16 @@ public void verifyArguments(Class[] argTypes) { String callableName = pyCallable.getAttribute("__name__").toString(); if (argTypes.length != parameters.size()) { - throw new IllegalArgumentException(callableName + ": " + "Expected " + parameters.size() + " arguments, got " + argTypes.length); + throw new IllegalArgumentException( + callableName + ": " + "Expected " + parameters.size() + " arguments, got " + argTypes.length); } for (int i = 0; i < argTypes.length; i++) { Set> types = parameters.get(i).getPossibleTypes(); - if (!types.contains(argTypes[i]) && !types.contains(Object.class) && !isSafelyCastable(types, argTypes[i])) { + if (!types.contains(argTypes[i]) && !types.contains(Object.class) + && !isSafelyCastable(types, argTypes[i])) { throw new IllegalArgumentException( - callableName + ": " + "Expected argument (" + parameters.get(i).getName() + ") to be one of " + parameters.get(i).getPossibleTypes() + ", got " + callableName + ": " + "Expected argument (" + parameters.get(i).getName() + ") to be one of " + + parameters.get(i).getPossibleTypes() + ", got " + argTypes[i]); } }