[teiid-commits] teiid SVN: r4344 - in trunk: engine/src/test/java/org/teiid/query/metadata and 7 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Mon Aug 20 13:04:49 EDT 2012
Author: shawkins
Date: 2012-08-20 13:04:48 -0400 (Mon, 20 Aug 2012)
New Revision: 4344
Modified:
trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java
trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java
trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java
trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java
trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java
Log:
TEIID-2116 clarifying the difference between runtime/builtin types
Modified: trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java
===================================================================
--- trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/engine/src/main/java/org/teiid/query/metadata/SystemMetadata.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -162,10 +162,10 @@
}
/**
- * Map of runtime types and aliases to built-in datatypes
+ * Map of runtime types and aliases to runtime datatypes
* @return
*/
- public Map<String, Datatype> getBuiltinTypeMap() {
+ public Map<String, Datatype> getRuntimeTypeMap() {
return typeMap;
}
Modified: trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/engine/src/test/java/org/teiid/query/metadata/TestTransformationMetadata.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -163,7 +163,7 @@
}
@Test public void testTypeCorrection() throws Exception {
- MetadataFactory mf = new MetadataFactory(null, 1, "x", SystemMetadata.getInstance().getBuiltinTypeMap(), new Properties(), null); //$NON-NLS-1$
+ MetadataFactory mf = new MetadataFactory(null, 1, "x", SystemMetadata.getInstance().getRuntimeTypeMap(), new Properties(), null); //$NON-NLS-1$
mf.setBuiltinDataTypes(SystemMetadata.getInstance().getSystemStore().getDatatypes());
Table t = mf.addTable("y"); //$NON-NLS-1$
Modified: trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java
===================================================================
--- trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/engine/src/test/java/org/teiid/query/parser/TestDDLParser.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -646,7 +646,7 @@
}
public static Map<String, Datatype> getDataTypes() {
- return SystemMetadata.getInstance().getBuiltinTypeMap();
+ return SystemMetadata.getInstance().getRuntimeTypeMap();
}
@Test public void testKeyResolve() {
Modified: trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java
===================================================================
--- trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/jboss-integration/src/main/java/org/teiid/jboss/VDBService.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -342,7 +342,7 @@
boolean cached = false;
Exception ex = null;
// designer based models define data types based on their built in data types, which are system vdb data types
- Map<String, Datatype> datatypes = getVDBRepository().getBuiltinDatatypes();
+ Map<String, Datatype> datatypes = getVDBRepository().getRuntimeTypeMap();
Map<String, Datatype> builtin = getVDBRepository().getSystemStore().getDatatypes();
final File cachedFile = getSerializer().buildModelFile(vdb, model.getName());
MetadataFactory factory = getSerializer().loadSafe(cachedFile, MetadataFactory.class);
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/IndexConstants.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -38,41 +38,6 @@
public final static char NAME_DELIM_CHAR = '.';
- //Index file name Constants
- public static class INDEX_NAME {
- public final static String TABLES_INDEX = "TABLES.INDEX"; //$NON-NLS-1$
- public final static String KEYS_INDEX = "KEYS.INDEX"; //$NON-NLS-1$
- public final static String COLUMNS_INDEX = "COLUMNS.INDEX"; //$NON-NLS-1$
- public final static String MODELS_INDEX = "MODELS.INDEX"; //$NON-NLS-1$
- public final static String VDBS_INDEX = "VDBS.INDEX"; //$NON-NLS-1$
- public final static String PROCEDURES_INDEX = "PROCEDURES.INDEX"; //$NON-NLS-1$
- public final static String DATATYPES_INDEX = "DATATYPES.INDEX"; //$NON-NLS-1$
- public final static String SELECT_TRANSFORM_INDEX = "SELECT_TRANSFORM.INDEX"; //$NON-NLS-1$
- public final static String INSERT_TRANSFORM_INDEX = "INSERT_TRANSFORM.INDEX"; //$NON-NLS-1$
- public final static String UPDATE_TRANSFORM_INDEX = "UPDATE_TRANSFORM.INDEX"; //$NON-NLS-1$
- public final static String DELETE_TRANSFORM_INDEX = "DELETE_TRANSFORM.INDEX"; //$NON-NLS-1$
- public final static String PROC_TRANSFORM_INDEX = "PROC_TRANSFORM.INDEX"; //$NON-NLS-1$
- public final static String MAPPING_TRANSFORM_INDEX = "MAPPING_TRANSFORM.INDEX"; //$NON-NLS-1$
- public final static String ANNOTATION_INDEX = "ANNOTATION.INDEX"; //$NON-NLS-1$
- public final static String PROPERTIES_INDEX = "PROPERTIES.INDEX"; //$NON-NLS-1$
- public final static String FILES_INDEX = "FILES.INDEX"; //$NON-NLS-1$
- public final static String[] INDEX_NAMES = new String[]{TABLES_INDEX, KEYS_INDEX,
- COLUMNS_INDEX, PROCEDURES_INDEX, MODELS_INDEX,
- VDBS_INDEX, DATATYPES_INDEX, SELECT_TRANSFORM_INDEX,
- INSERT_TRANSFORM_INDEX, UPDATE_TRANSFORM_INDEX,
- DELETE_TRANSFORM_INDEX, PROC_TRANSFORM_INDEX,
- MAPPING_TRANSFORM_INDEX, ANNOTATION_INDEX, PROPERTIES_INDEX, FILES_INDEX};
-
- public final static boolean isKnownIndex(String indexName) {
- for (int i = 0; i < INDEX_NAMES.length; i++) {
- if (INDEX_NAMES[i].equalsIgnoreCase(indexName)) {
- return true;
- }
- }
- return false;
- }
- }
-
//Search Record type Constants
public static class SEARCH_RECORD_TYPE {
public final static char RESOURCE = 'A';
Modified: trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java
===================================================================
--- trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/metadata/src/main/java/org/teiid/metadata/index/SimpleIndexUtil.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -170,41 +170,4 @@
return tmp.toArray(new Index[tmp.size()]);
}
- /**
- * Return the name of the index file to use for the specified record type, applies only for sever and vdb
- * index files.
- * @param recordType
- * @return
- */
- public static String getIndexFileNameForRecordType(final char recordType) {
- switch (recordType) {
- case MetadataConstants.RECORD_TYPE.COLUMN: return IndexConstants.INDEX_NAME.COLUMNS_INDEX;
- case MetadataConstants.RECORD_TYPE.TABLE: return IndexConstants.INDEX_NAME.TABLES_INDEX;
- case MetadataConstants.RECORD_TYPE.MODEL: return IndexConstants.INDEX_NAME.MODELS_INDEX;
- case MetadataConstants.RECORD_TYPE.CALLABLE:
- case MetadataConstants.RECORD_TYPE.CALLABLE_PARAMETER:
- case MetadataConstants.RECORD_TYPE.RESULT_SET: return IndexConstants.INDEX_NAME.PROCEDURES_INDEX;
- case MetadataConstants.RECORD_TYPE.INDEX:
- case MetadataConstants.RECORD_TYPE.ACCESS_PATTERN:
- case MetadataConstants.RECORD_TYPE.PRIMARY_KEY:
- case MetadataConstants.RECORD_TYPE.FOREIGN_KEY:
- case MetadataConstants.RECORD_TYPE.UNIQUE_KEY: return IndexConstants.INDEX_NAME.KEYS_INDEX;
- case MetadataConstants.RECORD_TYPE.SELECT_TRANSFORM: return IndexConstants.INDEX_NAME.SELECT_TRANSFORM_INDEX;
- case MetadataConstants.RECORD_TYPE.INSERT_TRANSFORM: return IndexConstants.INDEX_NAME.INSERT_TRANSFORM_INDEX;
- case MetadataConstants.RECORD_TYPE.UPDATE_TRANSFORM: return IndexConstants.INDEX_NAME.UPDATE_TRANSFORM_INDEX;
- case MetadataConstants.RECORD_TYPE.DELETE_TRANSFORM: return IndexConstants.INDEX_NAME.DELETE_TRANSFORM_INDEX;
- case MetadataConstants.RECORD_TYPE.PROC_TRANSFORM: return IndexConstants.INDEX_NAME.PROC_TRANSFORM_INDEX;
- case MetadataConstants.RECORD_TYPE.MAPPING_TRANSFORM: return IndexConstants.INDEX_NAME.MAPPING_TRANSFORM_INDEX;
- case MetadataConstants.RECORD_TYPE.DATATYPE: return IndexConstants.INDEX_NAME.DATATYPES_INDEX;
- //case IndexConstants.RECORD_TYPE.DATATYPE_ELEMENT:
- //case IndexConstants.RECORD_TYPE.DATATYPE_FACET:
- case MetadataConstants.RECORD_TYPE.VDB_ARCHIVE: return IndexConstants.INDEX_NAME.VDBS_INDEX;
- case MetadataConstants.RECORD_TYPE.ANNOTATION: return IndexConstants.INDEX_NAME.ANNOTATION_INDEX;
- case MetadataConstants.RECORD_TYPE.PROPERTY: return IndexConstants.INDEX_NAME.PROPERTIES_INDEX;
- //case IndexConstants.RECORD_TYPE.JOIN_DESCRIPTOR: return null;
- case MetadataConstants.RECORD_TYPE.FILE: return IndexConstants.INDEX_NAME.FILES_INDEX;
- }
- throw new IllegalArgumentException("Unkown record type " + recordType);
- }
-
}
Modified: trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/runtime/src/main/java/org/teiid/deployers/VDBRepository.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -72,7 +72,7 @@
private boolean odbcEnabled = false;
private List<VDBLifeCycleListener> listeners = new CopyOnWriteArrayList<VDBLifeCycleListener>();
private SystemFunctionManager systemFunctionManager;
- private Map<String, Datatype> datatypeMap = SystemMetadata.getInstance().getBuiltinTypeMap();
+ private Map<String, Datatype> datatypeMap = SystemMetadata.getInstance().getRuntimeTypeMap();
private ReentrantLock lock = new ReentrantLock();
private Condition vdbAdded = lock.newCondition();
@@ -232,7 +232,7 @@
private MetadataStore getODBCMetadataStore() {
try {
- PgCatalogMetadataStore pg = new PgCatalogMetadataStore(CoreConstants.ODBC_MODEL, getBuiltinDatatypes());
+ PgCatalogMetadataStore pg = new PgCatalogMetadataStore(CoreConstants.ODBC_MODEL, getRuntimeTypeMap());
return pg.asMetadataStore();
} catch (TranslatorException e) {
LogManager.logError(LogConstants.CTX_DQP, e, RuntimePlugin.Util.gs(RuntimePlugin.Event.TEIID40002));
@@ -260,7 +260,7 @@
return removed.getVDB();
}
- public Map<String, Datatype> getBuiltinDatatypes() {
+ public Map<String, Datatype> getRuntimeTypeMap() {
return datatypeMap;
}
Modified: trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java
===================================================================
--- trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/runtime/src/main/java/org/teiid/runtime/EmbeddedServer.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -535,7 +535,7 @@
ConnectorManagerRepository cmr,
MetadataRepository metadataRepository, MetadataStore store,
AtomicInteger loadCount) throws TranslatorException {
- Map<String, Datatype> datatypes = this.repo.getBuiltinDatatypes();
+ Map<String, Datatype> datatypes = this.repo.getRuntimeTypeMap();
MetadataFactory factory = new MetadataFactory(vdb.getName(), vdb.getVersion(), model.getName(), datatypes, model.getProperties(), model.getSchemaText());
factory.setBuiltinDataTypes(this.repo.getSystemStore().getDatatypes());
factory.getSchema().setPhysical(model.isSource());
Modified: trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/test-integration/common/src/test/java/org/teiid/jdbc/TestDynamicImportedMetaData.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -72,7 +72,7 @@
private MetadataFactory createMetadataFactory(String schema, Properties importProperties) {
VDBRepository vdbRepository = new VDBRepository();
- return new MetadataFactory("vdb", 1, schema, vdbRepository.getBuiltinDatatypes(), importProperties, null);
+ return new MetadataFactory("vdb", 1, schema, vdbRepository.getRuntimeTypeMap(), importProperties, null);
}
@Test public void testUniqueReferencedKey() throws Exception {
Modified: trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java
===================================================================
--- trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java 2012-08-20 16:53:29 UTC (rev 4343)
+++ trunk/test-integration/common/src/test/java/org/teiid/systemmodel/TestMatViewAliasing.java 2012-08-20 17:04:48 UTC (rev 4344)
@@ -50,7 +50,7 @@
server = new FakeServer(true);
VDBRepository vdbRepository = new VDBRepository();
- MetadataFactory mf = new MetadataFactory(null, 1, "foo", vdbRepository.getBuiltinDatatypes(), new Properties(), null);
+ MetadataFactory mf = new MetadataFactory(null, 1, "foo", vdbRepository.getRuntimeTypeMap(), new Properties(), null);
mf.getSchema().setPhysical(false);
Table mat = mf.addTable("mat");
mat.setVirtual(true);
More information about the teiid-commits
mailing list