TEIID-2849: adding array type as not searchable, and readable

teiid · Mar 31, 2014 · 22e98b9 · 22e98b9
1 parent e307160
commit 22e98b9
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 15 deletions.
diff --git a/...ranslator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBExecutionFactory.java b/...ranslator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBExecutionFactory.java
@@ -23,6 +23,7 @@
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.lang.reflect.Array;
 import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.Blob;
@@ -361,20 +362,17 @@ public InputStream getInputStream() throws IOException {
 			});
 		}
 		else if (value instanceof BasicDBList) {
-		    /*
+		    BasicDBList arrayValues = (BasicDBList)value;
             //array
-		    if (expectedClass.isArray()) {
+		    if (expectedClass.isArray() && !(arrayValues.get(0) instanceof BasicDBObject)) {
 		        Class arrayType = expectedClass.getComponentType();
-    		    if (!(((BasicDBList)value).get(0) instanceof BasicDBObject)) {
-    		        ArrayList<String> values = new ArrayList<String>();
-    		        Iterator iter = ((BasicDBList)value).iterator();
-    		        while (iter.hasNext()) {
-    		            values.add((String)iter.next());
-    		        }
-    		        value = values.toArray(new String[values.size()]);
-                }
+		        Object array = Array.newInstance(arrayType, arrayValues.size());		        
+                for (int i = 0; i < arrayValues.size(); i++) {
+                    Object arrayItem = retrieveValue(arrayValues.get(i), arrayType, mongoDB, fqn, colName);
+                    Array.set(array, i, arrayItem);
+                }		        
+                value = array;
 		    }
-		    */
 		}
 		return value;
 	}

diff --git a/...anslator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBMetadataProcessor.java b/...anslator-mongodb/src/main/java/org/teiid/translator/mongodb/MongoDBMetadataProcessor.java
@@ -26,10 +26,8 @@
 import java.util.Date;
 
 import org.bson.types.Binary;
-import org.teiid.metadata.Column;
-import org.teiid.metadata.ExtensionMetadataProperty;
-import org.teiid.metadata.MetadataFactory;
-import org.teiid.metadata.Table;
+import org.teiid.metadata.*;
+import org.teiid.metadata.Column.SearchType;
 import org.teiid.mongodb.MongoDBConnection;
 import org.teiid.translator.MetadataProcessor;
 import org.teiid.translator.TranslatorException;
@@ -120,6 +118,7 @@ else if (value instanceof BasicDBList) {
             }
             else {
                 column = metadataFactory.addColumn(columnKey, getDataType(((BasicDBList)value).get(0))+"[]", table); //$NON-NLS-1$
+                column.setSearchType(SearchType.Unsearchable);
             }                
         }
         else if (value instanceof DBRef) {