[teiid-commits] teiid SVN: r3901 - in branches/7.4.x/metadata/src: test/java/org/teiid/metadata/index and 1 other directories.
teiid-commits at lists.jboss.org
teiid-commits at lists.jboss.org
Tue Feb 28 14:35:14 EST 2012
Author: jolee
Date: 2012-02-28 14:35:14 -0500 (Tue, 28 Feb 2012)
New Revision: 3901
Added:
branches/7.4.x/metadata/src/test/resources/ora.vdb
Modified:
branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
branches/7.4.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
Log:
TEIID-1954 correcting associating index records from index metadata
Modified: branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java
===================================================================
--- branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2012-02-28 05:06:11 UTC (rev 3900)
+++ branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/IndexMetadataFactory.java 2012-02-28 19:35:14 UTC (rev 3901)
@@ -390,8 +390,11 @@
loadColumnSetRecords(columnSetRecordImpl, uuidColumnMap);
columnSetRecordImpl.setParent(tableRecord);
}
- tableRecord.setIndexes(getByParent(tableRecord.getUUID(), MetadataConstants.RECORD_TYPE.INDEX, KeyRecord.class, false));
- for (KeyRecord columnSetRecordImpl : tableRecord.getIndexes()) {
+ List<KeyRecord> indexRecords = tableRecord.getIndexes();
+ for (int i = 0; i < indexRecords.size(); i++) {
+ indexRecords.set(i, (KeyRecord) getRecordByType(indexRecords.get(i).getUUID(), MetadataConstants.RECORD_TYPE.INDEX));
+ }
+ for (KeyRecord columnSetRecordImpl : indexRecords) {
loadColumnSetRecords(columnSetRecordImpl, uuidColumnMap);
columnSetRecordImpl.setParent(tableRecord);
}
Modified: branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java
===================================================================
--- branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-02-28 05:06:11 UTC (rev 3900)
+++ branches/7.4.x/metadata/src/main/java/org/teiid/metadata/index/RecordFactory.java 2012-02-28 19:35:14 UTC (rev 3901)
@@ -46,6 +46,7 @@
import org.teiid.metadata.BaseColumn.NullType;
import org.teiid.metadata.Column.SearchType;
import org.teiid.metadata.Datatype.Variety;
+import org.teiid.metadata.KeyRecord.Type;
/**
@@ -427,7 +428,16 @@
table.setPrimaryKey(pk);
}
- tokenIndex+=4; //skip reading uuids for associated records
+ List<String> indexes = getStrings(tokens.get(++tokenIndex), getListDelimiter(indexVersion));
+ if (!indexes.isEmpty()) {
+ table.setIndexes(new ArrayList<KeyRecord>(indexes.size()));
+ for (String string : indexes) {
+ KeyRecord index = new KeyRecord(Type.Index);
+ index.setUUID(string);
+ table.getIndexes().add(index);
+ }
+ }
+ tokenIndex+=3; //skip reading uuids for associated records
if(includeMaterializationFlag(indexVersion)) {
// The next token are the UUIDs for the materialized table ID
Modified: branches/7.4.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java
===================================================================
--- branches/7.4.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2012-02-28 05:06:11 UTC (rev 3900)
+++ branches/7.4.x/metadata/src/test/java/org/teiid/metadata/index/TestMultipleModelIndexes.java 2012-02-28 19:35:14 UTC (rev 3901)
@@ -51,6 +51,12 @@
assertNotNull(t.getColumns().get(0).getDatatype());
}
+ @Test public void testIndex() throws Exception {
+ TransformationMetadata tm = VDBMetadataFactory.getVDBMetadata(UnitTestUtil.getTestDataPath() + "/ora.vdb");
+ Collection indexes = tm.getIndexesInGroup(tm.getGroupID("ORACLE_BQT.SMALLA"));
+ assertEquals(1, indexes.size());
+ }
+
@Test public void testSchemaLoad() throws Exception {
TransformationMetadata tm = VDBMetadataFactory.getVDBMetadata(UnitTestUtil.getTestDataPath() + "/Test.vdb");
Added: branches/7.4.x/metadata/src/test/resources/ora.vdb
===================================================================
--- branches/7.4.x/metadata/src/test/resources/ora.vdb (rev 0)
+++ branches/7.4.x/metadata/src/test/resources/ora.vdb 2012-02-28 19:35:14 UTC (rev 3901)
@@ -0,0 +1,86 @@
+PK
+÷Òà#LÁ%JO'Ø{«Bn©¥qÎY³Ñ{ö
+æïﮯ|àuJפôëùÍl:{K's
À<BC6]áÐç¢+¥÷dFU
îÃ1ÛMÿÉÅ/WOc]y)0J8$1ã¯D¿Ïâ$á,O ⽯ëïÏÝŧÅF]{SQtv·Ô§Ú9÷ýóôÍO·wõ`úsÞ²>OÃäu½°°?FÑpx·ÖTq(´UÂìî¯ú5Õ²ÍvþÔ¹ìî¹Â¸th¸_ð|9éüPK})^X¿
+§©w['y~>èuÏjá|Ü÷µî};p¾Ê]*m|Jn#
îÒ,ô0òDÎK"SUÙen[æNÇɲùA*\éÿ;9fB3"5 {<f+ðg ÁûÄE\骾=¿Õª»Ûó½Ú`RA4»`˨äcÚéØyæ«@{Ô¥gïM¯?5Ýßmh)¼)*:8¬TôFÞK)ÀzÒ;îvõq÷?µ¡`H[4lmtcFã5$0·AíüèÞq½e?êúReÏ©PûZ¾¾û¼l¯ã¼¢ï®Ó¬øîqW+Tç{{ynÎrëÎkw.4¶¼Ç³¬0iy
+±%M´0¸¢ä1DÄX|¼a
+½sÂUgµ¦±f³e,ÑB¤" 9æ¦Ë C¥FÞJ˲ÍÆz
+ðçö7pE¥ú^+6ÖëJT1%!$eØ(81"öTêf¡?lºYáú¨JÇçH¨¸Ïf²À]åÆM UÞfµÎÏ'Ë×*~|V)Ébkå%éÄRÜI!7<±'B\ä³N 󤥼٩Z rÂqmd `¦U+³CjÂÊ04(º:oÚWüó1õ÷ý|ÆÕu/íl6· +Y8
¬h|2×ó²a5n{BwQÇD
.5Q T¹³µìEn²9Á,ïdZ-¾Ç^1
+>z
+ÕF;&©¯ñ[9zÚÛ?
+þüj¢Äb%KlYý"hÃ<EÑgùý3{µ÷ó·-·¶·¢ËîueM [½°þP¡³þáa*æ@yT2²²ÌD±ÞÂKwlµSôFõ´5Ǫʴ ±x-áX-µr¥Xæ&·ÆýnÆ°ÌW°ÇäcxqÌ[ÕË
+Ä°FEéJ"â¹ÆäARô~ßCàZa%
!p}§ü(öîw§{w1+Íef|¿ó³½·^ÀzV«g/æHé0+D§«¸º.ËüõíÍý<uÕ7DßëFtK±µlkz}>«î¥;ÿÿ[¥¡5lpBÁåf=£;&jÊØcKã©îtÖûè¿Ü¯ò³íÆ:ÁX÷éÈòFiþ«ÉfßÀPô´(]~ô0¢Àd¸®Jbã dT©4î¡ñX9ey¢-uRiåö½J¬çýlù½AU£¤,<ü¦³ÕµønWsï½Ûܽ½Ígw
ßزoýª_}aùm´ëºªqp·ê\ñëÁ¸ö¨{4èµß^½éuÚu¯}ÕG¯cн|½ ËI^+Éiï¤uúZQV³¼VA÷ìzùøÊÇ]ç¤;z^˯\^«ÖðbÐ]t/G£÷gì/¿r®QÿìÃkº:ëôözc·Ë
+·¤ó×[]Ó³ñô»~líð¹ô'ß=-½JÍiì>A¦6d½¸À?h¯¿ãÄçÿPKe¹P=`
+
+øÔ¤8ö ÍEm)ñ±Å.&eæåû?rMÙ ÎçÌ8¡ÃT:ó ÌRÜ;Ã46ÚyÁʯ,:N1Jáõ\#¶*ëüáä³íkÎ-Ä®©Ó
+×¢£æéI㸠ß×[¯ELùÇ#!f¹AR¼áâØZÎy
|·
+p¿ËDHv²Ë@òmva
±³ÌÃÈl_ºc7ºë¦gózçÄ¡ ÃÈ0¸ÄQ0AFPÄN§÷2wCÓÜå_~Ù?k¶¯§U±^TdnrfļfHDZ
+®¥ R$±Ã)xÈXZ9û6I· 7'o·q§çFж¼
+»[)°4y¬¹mb$¦ÈO~þú¨µPÔQï8$'ñÆ"&IÖyñ*q*J\¥mÓÉé¶
"Ým!wù²Jíê1Ýä!¹fNJÃ%®²® Ú Üº_¹£ÂþÄíJ¡¥ðìwPn_4Þ-N¸ÎÛÔ
+:¤wHRJêNMe¿· Y£{¨[å Òå·«0[¨)úºß®Ä¸"T#ÂîçfA×î¬kÆô³rÅϧÈI(Þ¹Yë Ù:obIÓ,¦|´I¤a>#±Hc3¢+%Ï:á¶ÓØkÿeK9
gÇçGß5¯Ö*§rDa§Phhs¥N¡ßP°2´ÊwÂSåÛ
+WñCz¼LNXÎiéâøÎÎãûúEÖ&Чï>Vd>þþòùùÅÕúbIæ¸t`£
JªzìMML
¬Ì×2Uí/a»
+²¢¢I®.íÓ¹;aI¢N
+´o,M`Í aò32ªò¼²^L¤
+Ày©ÈBqv°£Ø+é;÷ë/û¸<A¥BÂß:äSb 0h4âÁÅÒ8%Ie=1çL¥Odû/0mmÚ{~Õ<k\^ÕÏ^®æVSèábHÀ?Á`Í 3ÑFNä\W6¿ët·Ðo¹z wô'?ùòa]ÒÜÌ_A®å¦Ø¥(¥ T]Î4ØGc¤½ej¤3Îßæaɾ§uïعUÓöþõ¢êSÑ/Þ®5´÷ûxvÓK`êôÇrËßÏÃuæ÷P_:
ú¶VÔ7Û'o_>sÙ<®·ø)vi°fß¾}ÿîó¨c²êuP~?-_m8WXhùǼ¡aý¾3Ù-ZñÝóG«Mm[¿ëôk¸ºì¨×ûÁQ4tögw9j$¡¤=Çö#njÿõåpà;]×ìCôkL'áuäL·ó~ä"«Æj<tGë+X+ö\ÍN0*N~Nòس´ùkéªÑ(;?3#*s=ÿÙÍØûª§¨ÿ<¦%+mh?Vcw=~¾Í¾Å>tÆ#«#³|ýãNåÕuù9J84DÅPþ!â21°Øaº¶Ø¤±I=R£7êѱöê/`ÕuæÝAEíñPõG]iX
ÂlÇÜùßÿÃþMþøëÿ `¹ÿ_|w`ïPKNîl%
+ORȶ$2X¯»qoàÇ/¾÷¾b³C7ï
+X8Ùp ÏÏóóküÈÓʼÃrÂ¥ÆÄÓVÐ\K.Ç>öó»ÿ¸ÙöúÔ!èl£J'AJHH%ñBIRöZTÓ[SóÃÏ×ç/+Û?Cñì¨ÙÅç'×±èø
äú¹ÁDPÙÁÛåIö¾ <a¶¤´,lEn÷dþí|x=ºÇ£û»Ù¼½K~ãÅ÷'yåqÔ¿+æÄ"#ñH$Ïa81´$æ³,û¥ç¯o^ýü©ë£ÓÞ<ÇûõÛgWÒ{È©·Ó÷Ï;Óñ}®coªß÷ûÜsùîõÛn÷k=Âüè|^çá¤WÇXd?ï}èõ{ÓH|Ý^½¹y×=®ß{¿ÜçWùãd9ß#OåQ ¢$Å|Ã|cy«"Y:½aÊy}Wd4É-ÑÑà.®9F ¾H<1°n5ЮNxð~ËotßïBï6®Ásuµ|ti%ãÌ
+mIÑÈ)9Klp_cNkuXqëæêüõ÷
+«»ub½À?\½üáä
+Ø_¬.£M÷&¡û» @Þ~ÅÕÉ,Q¹ÔGBFj2N)' «
+6¦
+l^ý6ÿ^Ìý£Q)Ze4
+(.b¥%A"eoâg/ü6 Ý:ñ§R°AF¡
+¬Ê2
+½âm,DÙ¨\QAê²ò¿w/OÈ´y|=áÙÑÇØĸ~::5CF÷ù+ £:%D´ÏéYZ¤gI¢fQÜ*©u/¹²qxo?´ÿ½~å0¦@Jä*HgDºà!" ¢Rr±DöôòíîY¶['¾¡»©ß-5±hbËGt#ã$zm8c1[aè¾øù¦ ÛÃû"û_lñÈH-Yë<ãµlÑsíô*-ÜýxÒ}{¶CÛÍkpëáÇ 5hh§½AÆÇÁÝ×V
+1Uð¸d Le³wÑ.DZ"{s~ÑìÖoÈ.ÔsL5Ñؤ!y¨ VJ(
r6IÎ[È^ß\¼ù,¼Ûg¿a¼`oV«¢õ¨U,Ë
ʼ¶N\V¿¸¼ì¼nDøÓsû^öFø7
Þ )fUjÍR"A]â²µEEQãÇHU^B\ex#¾['ÖàÖê½åÿ¸ROÆ
DJJ"©+®Ï ¹ÝKZì*©_ÿpyuÓÀöo©}õmNJÓ2' ë
+Éæ¼³6Ûòúìû³f5þ¦N7v[§àÉ<(TUGi"YK<¥À©Ú@úôìåùÅI÷sHzúÿQyê¤b´¨D8eµ/V2ñ<F¢Öx«õÿ={Ù>9õ¥§²ÿP¸hq¿ÊwçÞ®ý9ûWïzÃé¿òG,ë|u?´M×xÙ%oêom[ç/Géï
+óx×rk$˪Ô}nÌƧ!Êq.{©h,ëv·_=±aýµQ8
+G²ªCãC eR/f£·Æß6uÄWÕ8D^
+Xp¯ÂØç|,÷¼GÃaÕã4KÆ$öýdÒ9øàû÷Ày4Ûê8üg
+ñp¾íq:»lµÂ5"ª*¨¦R:Ì2GDLZû#ÞG¥×ÏÇ;GêàʨÅþ}ÜÀQÜ*b¾A=4I6çd,9öFàÏ^Êãó´ÏíjW*Õ :õ'yXy4ÈÃéáÀg=n;Cz¢AD¢¯Û/(¤Î"?AyXéÂöÙÆ0<7Þ&@.6Øê24Sb
+ç$ä|*6ªv ³þHîÇýÕ +Çó§ï{Ããÿ¹LúiBíá`ðpoãÞûiÍMÇLqv\O¶0SdÁ%ã¤Ô6º´u§#!^Â#ѨXhûÕ<_d¾óÓé3âa!>G8é8"Õãf:I¡ÕCÎ0³D4ÏLÂx»kf+ûþlˬ8£ê®(R&U&\KQ
+Â0þ·Çö4Oâ¸w7{ã`i|àDÔ"ËÚâD pÑXÊk¸û ¢ÖíÃ/SþøhûÂ$VýËYk-q%GQ2l=ãH·£ñÇGÖjyßÃãò¶
+s "§ËðO\»H½ÛÎß-]«Ýæu6ÞÈ=ÛÛÄ
+in~Áö;'ÇÛo|!%r¹k¼åkélÁZ"zUú3¤ hBµJÛ\ø»;,Ù¤w<ÉO¬¸þ¥ÓtËÕh4íìÚb
+ãÜ8Oà®Ö°*sO9èBM± Ïè~zw?]ëvÛßS?¾ÍÓýnZ/õûÜ¿«èµhÓì´H!@{{l+ÂGDÇSI<CRõt' ×oòr][ü¶j¬-¬öOE.Uúªû 0"õ¬Ezð¿_]^lyñÀѦ
¾ßkðY²³I¼
+åÀ4¢CH
+ÑÖ0:cvûêí¯ÝƵ¨)
+h+¬'¹¾'ÂÒ
+¹R_<Ùq6ïì Æ´4A&gæ
+¹!ã´ÚõÞ!8rÐ(ÐTm)~ÖBÇè£f0<M,1, C
+oDí¿0í mmp¡Ô² Ò±%m6©÷*OúuÉ^#÷YûK(AË¡&p³3à'{x2"mX/«ãdm$ mÐ%m6÷ÄÖ.¨´ð/=ðtÄØÚ˶%!<{Hr¤%öµ²ñ >$¡ÛÈ6ÛÌûJ5&Ä!´Ë`IB¨9IA)Lܺ§ô:©¥. æb$yͼò¶! ·ÚÞºÓÒ" ¼
+©Ôú@T¾@!G§P§'Ê8n:ûK®5N¨[/°¡2qÉ~W«=ܽYâk÷DÖý«ØuD,AµS"r3êõ¤õÓÔ8ZP)4«¨ÛµÒ)T=wNf°UÑÜÀV»±ûêÊOÞá8U;aàE%ÛÌâ!iSmïÓºzvÔÜ~]4Û5ç/~Yy¼øÍäÚÃLûP58ü¯P ,eE9Ç|^µmà&8Ï¥jV½2&´j{Ux¢Ï^9çÎÇùÛ¼0îï4o[ýÚq½³ÎÓÞ´a;ÛQä')(J@Äá
û%¢ãtñC°y7rÏÎóÃQ}aöÆôqëëQk3Õ&-º¶6J at mzÓ[§÷.S¶z!þ|VÛîM·ú)ÒwËDûyæ§76êÏë ¢^Á&òÕï<;ZüÿPK/R¥
+BrקÕhxß@Añõ¼ÙuÝ¥.Îr*XNUÂX½ÏúÏÛ½ÚQN;a "¬Õ0ú`½."ð)* ×J4¬ZknÈm;ÙPÖ©õÛÙÂ\/Ø £Ð`4âm,DÙ¨\QAêêv%6Ķ®-nX?Zi±bíÓ§°L>í|±®sb%$Ëg(
áf©Ä|e_wi)к«CÕ óÕõý§Ó2uÝõëÚ¨³:Yc-id#!SJS
+£ «
+fË×ûo`x@×?9ªÆFuÜYF´Ïªzi:D=Í&qQ\}'´¿RhJm;-ÝPÃ\V¬}2ýö;õ%ÊIÅhQpÊ2¬dßHRÁ¯µ³±îUMå*É»Ôt5ð8v5GåñUÂÖétaç÷Y)ÔZ{wpöyÿ´'LÚɸH Æ¢°*®`ÿ õÛ¨?«"WnY
2ùPÉVe]3üqpÚ=9ªÍÊ3+`wS´&}Npc°TQ7Á³µÆÙ¦Ü%Úbº¦Üüà{ϱJ$·~q¹û»ê´2GqjT¤2H¼)½ðW5Ó¨¼½'£äÕÆþ4èwÎãgÑÓ´P&
+QA¬*P
+e²¾±n
+]'¼]Ïn¨%>bßfaàÏ!ÓÓ+F
.Áî1
+Ûèì]4
q
oËî×-ú`nÕÚùïÓú=ÄgO¿l·»Yu4/GÏÿ¨Þ4½cwªoµÒe¬ÿî-bí6£¼Ý=Ý|÷eªÆ·wÇ^ßPôU}þϳmî/>l
+ìê
+,A¡87½}éaùæp®9èBM±°:ëô (ØûlïÉiÿxoÞÇ/¡íýÊ
+ô;Ý¡FAäÿéßÿÿÌÞßô
+æóóèbz9D¯ûù§³u?ÝLÍ÷~;m¶¼ÃúytW×Ëñhôðð0,²ù°(ç#°Ùo©º[ØfÅÀ¶ë©»Ei^Õ6wagåS;/mÖ±ÌBm3[ézèl´y,|XT£7ÛÝ;ã,sEzÚ^ÂÖa¶í¢§ñû½ÁÎE]Ú¼J2Û¬÷t3ëEÀü`p¶b|Ól¹Èó¢Þ¼Ü¤bµJýyeÍ÷ØÄB%!È9#n@6`°{§¥I4XifËÇÝ¡Êô;bÜ,Í@îÇÉûÙëhp[~åBù§Í`yÒÔÞ*ç¡<¼ý¸Sò!ÞSLàsD0Åè
1ºÙÞÞ3ÉEYWÇ»8ñÂ;¼åq¬9±±vYãùÎ^a-öëÂ'æ¤$;ÁÎþ¾½zÃàé²
+gëÊ7éèÓôM4Úftt:¥ÛâÇ/¼¶)Px?V(FWâ#ª3Bb¢»§²u{ìÅSÃà ð¸³Å.ÄBc´8¨7á/û×ÎC¡ÞØrê»Q/¶ °®ò:Á1c(%Ä '9CS!«]+çS\Ö&è¯øà8
+fÚ#¡cä´`ÉwÞq¢Z½-ªt«
+Íì±ó8ê
+S1åcRÞLl2(1í½áÎìúõç:TõiØR/äÈ+ç#c@0ϼۨn.ö¸ÏF-ìg5À3a¨÷ÈòÆ2ÚzçqÓ·è6¶oI¡W
+zs¤&Zxà#p£d× XM½£P1ßq<û*¿/ëÊB¼D$0XBÚ(õ 'P¥ÎèDîÔì4Þ$*0nOðÁ!e×ÁK´úà®öOG¦síÚÓ7:UªR±âÀjìqE
+Ül7»æ×Õϸ{å}ã
+3Úh¤cAÈ%V5e©ûn×=äÆ.0ÑÀR¥ãS*O¿,f§LÞEcébU/WuõBíýXÝ
Ųa¯w '¢s
+{sâ±bÈ0ï :ïbÇâp$C¹ÿcZ`Ü!î¡ñy¬Si̤hf*, :Àßy4½º¾ºýòjm
³ý éàmZV5ÔdùèëhËÍaá9Ø'qºrzÈp!AóPæ.-]¥dÂ2ÃÕ 4ØyLQðXöp[Z#b$á®on¼&OJ÷´¢ÛJîWSÛÍÙvü»ÂÌÆpS?>í¶Õj¹Ó>,½a5±*ìÒUâzÑÐô4±°T§÷a;¥yÝLeÁ¥í?2дWyúeÞ
ÇåîÏ`LÔÂ5í`Þ±FM¼.1"¤¹ëP½ìJ>¨ªÒà®Éó£å«÷!Å-G»çvÊNm½"Ù²vûîó[Z[ïߣ¿³Ñ)ÑÉiÒw"ýFÿGÍó$«ÒÁzUd¡Yù0ÎFí?±ð÷PK3¿ç
+;t«3BKWºS%y3ÄÉHÜ5{ï1ÆNóÓì-6ÇMÒ$6¡Qøÿ°¶¤ï³åbçe÷ì8¾luº§qºyã<s
+NL((á<¢Dª0 Ôc^ê×ïÞùí±E²VóôæýfÜN÷¢×Ïúïf
Zêk¤!ÜÔw_É !¢¦eÀ¥ØfÎÜN6ñ°3«ÑoÆ(»Í3[¤½Éü¢=«v[ÁgÃÂ~²ã¦²Ï÷1¾¦$õ Ìz$óêA¥R%mR·Î"¿OþÉßùÉU'ÞñömdnÞÅ®9Ûéf=ð|P®Ú=¾¼Z[VÛ=ÔwCdfzU4OãdÛ¡ÊíÚÙ*¸bÃóG¾æ'§ÖzÂ÷a>§º~RQÿpß$§!gº*{ñiü®ÿâàµzÍå°ëb
+
\ No newline at end of file
More information about the teiid-commits
mailing list