[teiid-commits] teiid SVN: r3977 - in trunk: engine and 8 other directories.

teiid-commits at lists.jboss.org teiid-commits at lists.jboss.org
Thu Apr 5 14:55:23 EDT 2012


Author: rareddy
Date: 2012-04-05 14:55:21 -0400 (Thu, 05 Apr 2012)
New Revision: 3977

Modified:
   trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java
   trunk/engine/pom.xml
   trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
   trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
   trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java
   trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
   trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
   trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
   trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
   trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
Log:
TEIID-1976: index stores need to use the data types defined by system store to match with uuid based look ups. The sub-selection data types defined in the teiid map correctly with designer data types in terms of runtime type, however they do not align with uuids or their names. This fixes the both issues.

Modified: trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java
===================================================================
--- trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/api/src/main/java/org/teiid/metadata/MetadataStore.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -25,7 +25,6 @@
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -40,7 +39,7 @@
 	private static final long serialVersionUID = -3130247626435324312L;
 	protected Map<String, Schema> schemas = new TreeMap<String, Schema>(String.CASE_INSENSITIVE_ORDER);
 	protected List<Schema> schemaList = new ArrayList<Schema>(); //used for a stable ordering
-	protected Collection<Datatype> datatypes = new LinkedHashSet<Datatype>();
+	protected Map<String, Datatype> datatypes = new TreeMap<String, Datatype>();
 	protected Map<String, String> namespaces = new TreeMap<String, String>(String.CASE_INSENSITIVE_ORDER);
 	
 	public Map<String, Schema> getSchemas() {
@@ -67,18 +66,18 @@
 	}
 	
 	void addDataTypes(Collection<Datatype> types) {
-		this.datatypes.addAll(types);
+		if (types != null){
+			for (Datatype type:types) {
+				addDatatype(type);
+			}
+		}
 	}
 	
 	public void addDatatype(Datatype datatype) {
-		this.datatypes.add(datatype);
+		this.datatypes.put(datatype.getName(), datatype);
 	}
 		
-	/**
-	 * Get the datatypes defined in this store
-	 * @return
-	 */
-	public Collection<Datatype> getDatatypes() {
+	public Map<String, Datatype> getDatatypes() {
 		return datatypes;
 	}
 	
@@ -99,7 +98,7 @@
 			for (Schema s:store.getSchemaList()) {
 				addSchema(s);
 			}
-			this.datatypes.addAll(store.getDatatypes());
+			addDataTypes(store.getDatatypes().values());
 		}
 	}
 }

Modified: trunk/engine/pom.xml
===================================================================
--- trunk/engine/pom.xml	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/engine/pom.xml	2012-04-05 18:55:21 UTC (rev 3977)
@@ -33,6 +33,11 @@
         <dependency>
             <groupId>org.jboss.teiid</groupId>
             <artifactId>teiid-common-core</artifactId>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.jboss.teiid</groupId>
+            <artifactId>teiid-common-core</artifactId>
             <type>test-jar</type>
         </dependency>
 

Modified: trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/engine/src/main/java/org/teiid/dqp/internal/process/DataTierManagerImpl.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -273,7 +273,7 @@
 			final SystemTables sysTable = SystemTables.valueOf(group.getNonCorrelationName().substring(CoreConstants.SYSTEM_MODEL.length() + 1).toUpperCase());
 			switch (sysTable) {
 			case DATATYPES:
-				for (Datatype datatype : metadata.getDatatypes()) {
+				for (Datatype datatype : metadata.getDatatypes().values()) {
 					rows.add(Arrays.asList(datatype.getName(), datatype.isBuiltin(), datatype.isBuiltin(), datatype.getName(), datatype.getJavaClassName(), datatype.getScale(), 
 							datatype.getLength(), datatype.getNullType().toString(), datatype.isSigned(), datatype.isAutoIncrement(), datatype.isCaseSensitive(), datatype.getPrecisionLength(), 
 							datatype.getRadix(), datatype.getSearchType().toString(), datatype.getUUID(), datatype.getRuntimeTypeName(), datatype.getBasetypeName(), datatype.getAnnotation(), oid++));
@@ -543,7 +543,7 @@
 
 	public static Collection<AbstractMetadataRecord> getAllPropertiedObjects(CompositeMetadataStore metadata, Collection<Schema> schemas) {
 		Collection<AbstractMetadataRecord> records = new LinkedHashSet<AbstractMetadataRecord>();
-		records.addAll(metadata.getDatatypes());
+		records.addAll(metadata.getDatatypes().values());
 		for (Schema schema : schemas) {
 			records.add(schema);
 			for (Table table : schema.getTables().values()) {

Modified: trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/MetadataValidator.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -196,7 +196,7 @@
     					List<Expression> symbols = command.getProjectedSymbols();
     					for (Expression column:symbols) {
     						try {
-								addColumn(Symbol.getShortName(column), getDataType(store.getDatatypes(), column.getType()), t);
+								addColumn(Symbol.getShortName(column), getDataType(store.getDatatypes().values(), column.getType()), t);
 							} catch (TranslatorException e) {
 								log(report, model, e.getMessage());
 							}

Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -72,7 +72,10 @@
 	private TransformationMetadata exampleTransformationMetadata()
 			throws TranslatorException {
 		Map<String, Datatype> datatypes = new HashMap<String, Datatype>();
-        datatypes.put(DataTypeManager.DefaultDataTypes.STRING, new Datatype());
+		Datatype dt = new Datatype();
+		dt.setName(DataTypeManager.DefaultDataTypes.STRING);
+		dt.setJavaClassName(String.class.getCanonicalName());
+        datatypes.put(DataTypeManager.DefaultDataTypes.STRING, dt);
 		MetadataFactory mf = new MetadataFactory(null, 1, "x", datatypes, new Properties(), null); //$NON-NLS-1$
 		mf.addProcedure("y"); //$NON-NLS-1$
 		
@@ -112,7 +115,10 @@
 	
 	@Test public void testAmbiguousTableWithPrivateModel() throws Exception {
 		Map<String, Datatype> datatypes = new HashMap<String, Datatype>();
-        datatypes.put(DataTypeManager.DefaultDataTypes.STRING, new Datatype());
+		Datatype dt = new Datatype();
+		dt.setName(DataTypeManager.DefaultDataTypes.STRING);
+		dt.setJavaClassName(String.class.getCanonicalName());
+        datatypes.put(DataTypeManager.DefaultDataTypes.STRING, dt);		
 		MetadataFactory mf = new MetadataFactory(null, 1, "x", datatypes, new Properties(), null); //$NON-NLS-1$
 		mf.addTable("y"); //$NON-NLS-1$
 		MetadataFactory mf1 = new MetadataFactory(null, 1, "x1", datatypes, new Properties(), null); //$NON-NLS-1$

Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -29,6 +29,7 @@
 import java.util.HashSet;
 import java.util.IdentityHashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Executor;
 
@@ -66,9 +67,11 @@
 import org.teiid.dqp.internal.datamgr.TranslatorRepository;
 import org.teiid.logging.LogConstants;
 import org.teiid.logging.LogManager;
+import org.teiid.metadata.Datatype;
 import org.teiid.metadata.MetadataFactory;
 import org.teiid.metadata.MetadataRepository;
 import org.teiid.metadata.MetadataStore;
+import org.teiid.metadata.index.IndexMetadataRepository;
 import org.teiid.query.ObjectReplicator;
 import org.teiid.query.metadata.TransformationMetadata;
 import org.teiid.query.tempdata.GlobalTableStore;
@@ -304,9 +307,11 @@
 				}
 				
 				if (!metadataLoaded) {
-					factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), model.getName(), getVDBRepository().getBuiltinDatatypes(), model.getProperties(), model.getSchemaText());
+					boolean indexStore = (metadataRepo instanceof IndexMetadataRepository);
+					// designer based models define data types based on their built in data types, which are system vdb data types
+					Map<String, Datatype> datatypes = indexStore?getVDBRepository().getSystemStore().getDatatypes():getVDBRepository().getBuiltinDatatypes();
+					factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), model.getName(), datatypes, model.getProperties(), model.getSchemaText());
 					
-					
 					ExecutionFactory ef = null;
 					Object cf = null;
 					

Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataStore.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -272,7 +272,7 @@
 					uuidToRecord.put(datatype.getUUID(), datatype);
 				}
 			} else {
-				for (Datatype datatype : getDatatypes()) {
+				for (Datatype datatype : getDatatypes().values()) {
 					uuidToRecord.put(datatype.getUUID(), datatype);
 				}
 			}

Modified: trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java
===================================================================
--- trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/metadata/src/test/java/org/teiid/metadata/index/VDBMetadataFactory.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -84,7 +84,7 @@
 		}
 
 		try {
-			IndexMetadataStore imf = loadMetadata(vdbName, vdbURL, getSystem().getDatatypes());
+			IndexMetadataStore imf = loadMetadata(vdbName, vdbURL, getSystem().getDatatypes().values());
 			
 			Collection <FunctionMethod> methods = null;
 			Collection<FunctionTree> trees = null;

Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java	2012-04-05 18:55:21 UTC (rev 3977)
@@ -148,14 +148,27 @@
 	
 	public void setSystemStore(MetadataStore store) {
 		this.systemStore = store;
-		Collection<Datatype> datatypes = this.systemStore.getDatatypes();
-		for (Class<?> typeClass : DataTypeManager.getAllDataTypeClasses()) {
+		Collection<Datatype> datatypes = this.systemStore.getDatatypes().values();
+		
+		for (String typeName : DataTypeManager.getAllDataTypeNames()) {
+			
+			boolean found = false;
 			for (Datatype datatypeRecordImpl : datatypes) {
-				if (datatypeRecordImpl.getJavaClassName().equals(typeClass.getName())) {
-					datatypeMap.put(DataTypeManager.getDataTypeName(typeClass), datatypeRecordImpl);
+				if (datatypeRecordImpl.getRuntimeTypeName().equalsIgnoreCase(typeName)) {
+					datatypeMap.put(typeName, datatypeRecordImpl);
+					found = true;
 					break;
 				}
 			}
+			
+			if (!found) {
+				for (Datatype datatypeRecordImpl : datatypes) {
+					if (datatypeRecordImpl.getJavaClassName().equals(DataTypeManager.getDataTypeClass(typeName))) {
+						datatypeMap.put(typeName, datatypeRecordImpl);
+						break;
+					}			
+				}
+			}
 		}
 		
 		// add alias types

Modified: trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected
===================================================================
--- trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected	2012-04-05 18:55:12 UTC (rev 3976)
+++ trunk/test-integration/common/src/test/resources/TestSystemVirtualModel/testDataTypes.expected	2012-04-05 18:55:21 UTC (rev 3977)
@@ -1,52 +1,52 @@
 string                                                             boolean     boolean     string                                                             string                                                             integer      integer      string                boolean   boolean            boolean          integer      integer      string                string                                              string                                                            string                                                            string                                                             integer    
 Name                                                               IsStandard  IsPhysical  TypeName                                                           JavaClass                                                          Scale        TypeLength   NullType              IsSigned  IsAutoIncremented  IsCaseSensitive  Precision    Radix        SearchType            UID                                                 RuntimeType                                                       BaseType                                                          Description                                                        OID        
-ENTITIES                                                           false       false       ENTITIES                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:20360100-e742-1e20-8c26-a038c6ed7576         string                                                            ENTITY                                                            <null>                                                             9          
-ENTITY                                                             false       false       ENTITY                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576         string                                                            NCName                                                            <null>                                                             10         
-ID                                                                 false       false       ID                                                                 java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576         string                                                            NCName                                                            <null>                                                             13         
-IDREF                                                              false       false       IDREF                                                              java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576         string                                                            NCName                                                            <null>                                                             12         
-IDREFS                                                             false       false       IDREFS                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576         string                                                            IDREF                                                             <null>                                                             11         
-NCName                                                             false       false       NCName                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576         string                                                            Name                                                              <null>                                                             14         
-NMTOKEN                                                            false       false       NMTOKEN                                                            java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879         string                                                            token                                                             <null>                                                             16         
-NMTOKENS                                                           false       false       NMTOKENS                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576         string                                                            NMTOKEN                                                           <null>                                                             15         
-NOTATION                                                           false       false       NOTATION                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e         string                                                            anySimpleType                                                     <null>                                                             17         
-Name                                                               false       false       Name                                                               java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576         string                                                            token                                                             <null>                                                             18         
-QName                                                              false       false       QName                                                              java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e         string                                                            anySimpleType                                                     <null>                                                             19         
-XMLLiteral                                                         false       false       XMLLiteral                                                         org.teiid.core.types.XMLType                                       0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32         xml                                                               string                                                            <null>                                                             1          
-anyURI                                                             false       false       anyURI                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e         string                                                            anySimpleType                                                     <null>                                                             20         
-base64Binary                                                       false       false       base64Binary                                                       java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7         string                                                            anySimpleType                                                     <null>                                                             21         
-bigdecimal                                                         false       false       bigdecimal                                                         java.math.BigDecimal                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d         bigdecimal                                                        decimal                                                           <null>                                                             2          
-biginteger                                                         false       false       biginteger                                                         java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d         biginteger                                                        decimal                                                           <null>                                                             3          
-blob                                                               false       false       blob                                                               org.teiid.core.types.BlobType                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95         blob                                                              base64Binary                                                      <null>                                                             4          
-boolean                                                            false       false       boolean                                                            java.lang.Boolean                                                  0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7         boolean                                                           anySimpleType                                                     <null>                                                             22         
-byte                                                               false       false       byte                                                               java.lang.Byte                                                     0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016         byte                                                              short                                                             <null>                                                             23         
-char                                                               false       false       char                                                               java.lang.Character                                                0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d         char                                                              string                                                            <null>                                                             5          
-clob                                                               false       false       clob                                                               org.teiid.core.types.ClobType                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3         clob                                                              string                                                            <null>                                                             6          
-date                                                               false       false       date                                                               java.sql.Date                                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7         date                                                              anySimpleType                                                     <null>                                                             25         
-dateTime                                                           false       false       dateTime                                                           java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21         timestamp                                                         anySimpleType                                                     <null>                                                             24         
-decimal                                                            false       false       decimal                                                            java.math.BigDecimal                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7         bigdecimal                                                        anySimpleType                                                     <null>                                                             26         
-double                                                             false       false       double                                                             java.lang.Double                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7         double                                                            anySimpleType                                                     <null>                                                             27         
-duration                                                           false       false       duration                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21         string                                                            anySimpleType                                                     <null>                                                             28         
-float                                                              false       false       float                                                              java.lang.Float                                                    0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7         float                                                             anySimpleType                                                     <null>                                                             29         
-gDay                                                               false       false       gDay                                                               java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21         biginteger                                                        anySimpleType                                                     <null>                                                             30         
-gMonth                                                             false       false       gMonth                                                             java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21         biginteger                                                        anySimpleType                                                     <null>                                                             32         
-gMonthDay                                                          false       false       gMonthDay                                                          java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21         timestamp                                                         anySimpleType                                                     <null>                                                             31         
-gYear                                                              false       false       gYear                                                              java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21         biginteger                                                        anySimpleType                                                     <null>                                                             34         
-gYearMonth                                                         false       false       gYearMonth                                                         java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21         timestamp                                                         anySimpleType                                                     <null>                                                             33         
-hexBinary                                                          false       false       hexBinary                                                          java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7         string                                                            anySimpleType                                                     <null>                                                             35         
-int                                                                false       false       int                                                                java.lang.Integer                                                  0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016         integer                                                           long                                                              <null>                                                             37         
-integer                                                            false       false       integer                                                            java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576         biginteger                                                        decimal                                                           <null>                                                             36         
-language                                                           false       false       language                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576         string                                                            token                                                             <null>                                                             38         
-long                                                               false       false       long                                                               java.lang.Long                                                     0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016         long                                                              integer                                                           <null>                                                             39         
-negativeInteger                                                    false       false       negativeInteger                                                    java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016         biginteger                                                        nonPositiveInteger                                                <null>                                                             40         
-nonNegativeInteger                                                 false       false       nonNegativeInteger                                                 java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016         biginteger                                                        integer                                                           <null>                                                             41         
-nonPositiveInteger                                                 false       false       nonPositiveInteger                                                 java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576         biginteger                                                        integer                                                           <null>                                                             42         
-normalizedString                                                   false       false       normalizedString                                                   java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:4df43700-3b13-1e20-921b-eeee28353879         string                                                            string                                                            <null>                                                             43         
-object                                                             false       false       object                                                             java.lang.Object                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79         object                                                            base64Binary                                                      <null>                                                             7          
-positiveInteger                                                    false       false       positiveInteger                                                    java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016         biginteger                                                        nonNegativeInteger                                                <null>                                                             44         
-short                                                              false       false       short                                                              java.lang.Short                                                    0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016         short                                                             int                                                               <null>                                                             45         
-string                                                             false       false       string                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7         string                                                            anySimpleType                                                     <null>                                                             46         
-time                                                               false       false       time                                                               java.sql.Time                                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7         time                                                              anySimpleType                                                     <null>                                                             47         
-timestamp                                                          false       false       timestamp                                                          java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d         timestamp                                                         string                                                            <null>                                                             8          
+ENTITIES                                                           false       false       ENTITIES                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:20360100-e742-1e20-8c26-a038c6ed7576         string                                                            ENTITY                                                            <null>                                                             1          
+ENTITY                                                             false       false       ENTITY                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:9fece300-e71a-1e20-8c26-a038c6ed7576         string                                                            NCName                                                            <null>                                                             2          
+ID                                                                 false       false       ID                                                                 java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:88b13dc0-e702-1e20-8c26-a038c6ed7576         string                                                            NCName                                                            <null>                                                             3          
+IDREF                                                              false       false       IDREF                                                              java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:dd33ff40-e6df-1e20-8c26-a038c6ed7576         string                                                            NCName                                                            <null>                                                             4          
+IDREFS                                                             false       false       IDREFS                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3c99f780-e72d-1e20-8c26-a038c6ed7576         string                                                            IDREF                                                             <null>                                                             5          
+NCName                                                             false       false       NCName                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:ac00e000-e676-1e20-8c26-a038c6ed7576         string                                                            Name                                                              <null>                                                             6          
+NMTOKEN                                                            false       false       NMTOKEN                                                            java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:4ca2ae00-3a95-1e20-921b-eeee28353879         string                                                            token                                                             <null>                                                             7          
+NMTOKENS                                                           false       false       NMTOKENS                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:4b0f8500-e6a6-1e20-8c26-a038c6ed7576         string                                                            NMTOKEN                                                           <null>                                                             8          
+NOTATION                                                           false       false       NOTATION                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3dcaf900-e8dc-1e2a-b433-fb67ea35c07e         string                                                            anySimpleType                                                     <null>                                                             9          
+Name                                                               false       false       Name                                                               java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:e66c4600-e65b-1e20-8c26-a038c6ed7576         string                                                            token                                                             <null>                                                             10         
+QName                                                              false       false       QName                                                              java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:eeb5d780-e8c3-1e2a-b433-fb67ea35c07e         string                                                            anySimpleType                                                     <null>                                                             11         
+XMLLiteral                                                         false       false       XMLLiteral                                                         org.teiid.core.types.XMLType                                       0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:43f5274e-55e1-1f87-ba1c-eea49143eb32         xml                                                               string                                                            <null>                                                             12         
+anyURI                                                             false       false       anyURI                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:6247ec80-e8a4-1e2a-b433-fb67ea35c07e         string                                                            anySimpleType                                                     <null>                                                             13         
+base64Binary                                                       false       false       base64Binary                                                       java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:b4c99380-ebc6-1e2a-9319-8eaa9b2276c7         string                                                            anySimpleType                                                     <null>                                                             14         
+bigdecimal                                                         false       false       bigdecimal                                                         java.math.BigDecimal                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:f2249740-a078-1e26-9b08-d6079ebe1f0d         bigdecimal                                                        decimal                                                           <null>                                                             15         
+biginteger                                                         false       false       biginteger                                                         java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:822b9a40-a066-1e26-9b08-d6079ebe1f0d         biginteger                                                        decimal                                                           <null>                                                             16         
+blob                                                               false       false       blob                                                               org.teiid.core.types.BlobType                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:5a793100-1836-1ed0-ba0f-f2334f5fbf95         blob                                                              base64Binary                                                      <null>                                                             17         
+boolean                                                            false       false       boolean                                                            java.lang.Boolean                                                  0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:dc476100-c483-1e24-9b01-c8207cd53eb7         boolean                                                           anySimpleType                                                     <null>                                                             18         
+byte                                                               false       false       byte                                                               java.lang.Byte                                                     0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:26dc1cc0-b9c8-1e21-b812-969c8fc8b016         byte                                                              short                                                             <null>                                                             19         
+char                                                               false       false       char                                                               java.lang.Character                                                0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:62472700-a064-1e26-9b08-d6079ebe1f0d         char                                                              string                                                            <null>                                                             20         
+clob                                                               false       false       clob                                                               org.teiid.core.types.ClobType                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:559646c0-4941-1ece-b22b-f49159d22ad3         clob                                                              string                                                            <null>                                                             21         
+date                                                               false       false       date                                                               java.sql.Date                                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:65dcde00-c4ab-1e24-9b01-c8207cd53eb7         date                                                              anySimpleType                                                     <null>                                                             22         
+dateTime                                                           false       false       dateTime                                                           java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:5c69dec0-b3ea-1e2a-9a03-beb8638ffd21         timestamp                                                         anySimpleType                                                     <null>                                                             23         
+decimal                                                            false       false       decimal                                                            java.math.BigDecimal                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:569dfa00-c456-1e24-9b01-c8207cd53eb7         bigdecimal                                                        anySimpleType                                                     <null>                                                             24         
+double                                                             false       false       double                                                             java.lang.Double                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:1f18b140-c4a3-1e24-9b01-c8207cd53eb7         double                                                            anySimpleType                                                     <null>                                                             25         
+duration                                                           false       false       duration                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:28d98540-b3e7-1e2a-9a03-beb8638ffd21         string                                                            anySimpleType                                                     <null>                                                             26         
+float                                                              false       false       float                                                              java.lang.Float                                                    0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:d86b0d00-c48a-1e24-9b01-c8207cd53eb7         float                                                             anySimpleType                                                     <null>                                                             27         
+gDay                                                               false       false       gDay                                                               java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:860b7dc0-b3f8-1e2a-9a03-beb8638ffd21         biginteger                                                        anySimpleType                                                     <null>                                                             28         
+gMonth                                                             false       false       gMonth                                                             java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:187f5580-b3fb-1e2a-9a03-beb8638ffd21         biginteger                                                        anySimpleType                                                     <null>                                                             29         
+gMonthDay                                                          false       false       gMonthDay                                                          java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:6e604140-b3f5-1e2a-9a03-beb8638ffd21         timestamp                                                         anySimpleType                                                     <null>                                                             30         
+gYear                                                              false       false       gYear                                                              java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:b02c7600-b3f2-1e2a-9a03-beb8638ffd21         biginteger                                                        anySimpleType                                                     <null>                                                             31         
+gYearMonth                                                         false       false       gYearMonth                                                         java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:17d08040-b3ed-1e2a-9a03-beb8638ffd21         timestamp                                                         anySimpleType                                                     <null>                                                             32         
+hexBinary                                                          false       false       hexBinary                                                          java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:d9998500-ebba-1e2a-9319-8eaa9b2276c7         string                                                            anySimpleType                                                     <null>                                                             33         
+int                                                                false       false       int                                                                java.lang.Integer                                                  0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:33add3c0-b98d-1e21-b812-969c8fc8b016         integer                                                           long                                                              <null>                                                             34         
+integer                                                            false       false       integer                                                            java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:45da3500-e78f-1e20-8c26-a038c6ed7576         biginteger                                                        decimal                                                           <null>                                                             35         
+language                                                           false       false       language                                                           java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:d4d980c0-e623-1e20-8c26-a038c6ed7576         string                                                            token                                                             <null>                                                             36         
+long                                                               false       false       long                                                               java.lang.Long                                                     0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:8cdee840-b900-1e21-b812-969c8fc8b016         long                                                              integer                                                           <null>                                                             37         
+negativeInteger                                                    false       false       negativeInteger                                                    java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:86d29280-b8d3-1e21-b812-969c8fc8b016         biginteger                                                        nonPositiveInteger                                                <null>                                                             38         
+nonNegativeInteger                                                 false       false       nonNegativeInteger                                                 java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:0e081200-b8a4-1e21-b812-969c8fc8b016         biginteger                                                        integer                                                           <null>                                                             39         
+nonPositiveInteger                                                 false       false       nonPositiveInteger                                                 java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:cbdd6e40-b9d2-1e21-8c26-a038c6ed7576         biginteger                                                        integer                                                           <null>                                                             40         
+normalizedString                                                   false       false       normalizedString                                                   java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:4df43700-3b13-1e20-921b-eeee28353879         string                                                            string                                                            <null>                                                             41         
+object                                                             false       false       object                                                             java.lang.Object                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:051a0640-b4e8-1e26-9f33-b76fd9d5fa79         object                                                            base64Binary                                                      <null>                                                             42         
+positiveInteger                                                    false       false       positiveInteger                                                    java.math.BigInteger                                               0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:1cbbd380-b9ea-1e21-b812-969c8fc8b016         biginteger                                                        nonNegativeInteger                                                <null>                                                             43         
+short                                                              false       false       short                                                              java.lang.Short                                                    0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:5bbcf140-b9ae-1e21-b812-969c8fc8b016         short                                                             int                                                               <null>                                                             44         
+string                                                             false       false       string                                                             java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:bf6c34c0-c442-1e24-9b01-c8207cd53eb7         string                                                            anySimpleType                                                     <null>                                                             45         
+time                                                               false       false       time                                                               java.sql.Time                                                      0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3b892180-c4a7-1e24-9b01-c8207cd53eb7         time                                                              anySimpleType                                                     <null>                                                             46         
+timestamp                                                          false       false       timestamp                                                          java.sql.Timestamp                                                 0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:6d9809c0-a07e-1e26-9b08-d6079ebe1f0d         timestamp                                                         string                                                            <null>                                                             47         
 token                                                              false       false       token                                                              java.lang.String                                                   0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:3425cb80-d844-1e20-9027-be6d2c3b8b3a         string                                                            normalizedString                                                  <null>                                                             48         
 unsignedByte                                                       false       false       unsignedByte                                                       java.lang.Short                                                    0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:cff745c0-baa2-1e21-b812-969c8fc8b016         short                                                             unsignedShort                                                     <null>                                                             49         
 unsignedInt                                                        false       false       unsignedInt                                                        java.lang.Long                                                     0            0            No Nulls              false     false              false            0            0            Searchable            mmuuid:badcbd80-ba63-1e21-b812-969c8fc8b016         long                                                              unsignedLong                                                      <null>                                                             50         



More information about the teiid-commits mailing list