TEIID-5328 fix for regression

teiid · Apr 24, 2018 · 1fea122 · 1fea122
1 parent 038971b
commit 1fea122
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 11 deletions.
diff --git a/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java b/common-core/src/main/java/org/teiid/core/types/DataTypeManager.java
@@ -980,18 +980,29 @@ public static final String getCanonicalString(String value) {
     }
 
 	public static boolean isHashable(Class<?> type) {
-		if (type == DataTypeManager.DefaultDataClasses.STRING
-				|| type == DataTypeManager.DefaultDataClasses.CHAR) {
-			return COLLATION_LOCALE == null;
-		}
-		if (type == DataTypeManager.DefaultDataClasses.STRING) {
-			return 	!PAD_SPACE; 
-		}
-		return !(type == DataTypeManager.DefaultDataClasses.BIG_DECIMAL
-				|| type == DataTypeManager.DefaultDataClasses.BLOB
-				|| type == DataTypeManager.DefaultDataClasses.CLOB
-				|| type == DataTypeManager.DefaultDataClasses.OBJECT);
+		return isHashable(type, PAD_SPACE, COLLATION_LOCALE);
 	}
+
+	static boolean isHashable(Class<?> type, boolean padSpace, String collationLocale) {
+	    if (type == null) {
+	        return true;
+	    }
+	    if ((type == DataTypeManager.DefaultDataClasses.STRING
+                || type == DataTypeManager.DefaultDataClasses.CHAR) && collationLocale != null) {
+            return false;
+        }
+        if (type == DataTypeManager.DefaultDataClasses.STRING) {
+            return !padSpace; 
+        }
+        if (type.isArray() ) {
+            return isHashable(type.getComponentType(), padSpace, collationLocale);
+        }
+        return !(type == DataTypeManager.DefaultDataClasses.BIG_DECIMAL
+                || type == DataTypeManager.DefaultDataClasses.BLOB
+                || type == DataTypeManager.DefaultDataClasses.CLOB
+                || type == DataTypeManager.DefaultDataClasses.OBJECT);
+    }
+
 
 	public static Class<?> getArrayType(Class<?> classType) {
 		Class<?> result = arrayTypes.get(classType);

diff --git a/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java b/common-core/src/test/java/org/teiid/core/types/TestDataTypeManager.java
@@ -237,5 +237,10 @@ public String toString() {
     	Object value = new Object[] {"a", "b"};
         DataTypeManager.transformValue(value, value.getClass(), String[].class);
     }
+
+    @Test public void isHashable() {
+        assertFalse(DataTypeManager.isHashable(DataTypeManager.DefaultDataClasses.STRING, true, null));
+        assertFalse(DataTypeManager.isHashable(String[].class, false, "Something"));
+    }
 
 }