You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/07/12 20:37:37 UTC
svn commit: r1360852 - /jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java
Author: andy
Date: Thu Jul 12 18:37:37 2012
New Revision: 1360852
URL: http://svn.apache.org/viewvc?rev=1360852&view=rev
Log:
Secondary indexes were generated with the wrong order.
Modified:
jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java
Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java?rev=1360852&r1=1360851&r2=1360852&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java (original)
+++ jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java Thu Jul 12 18:37:37 2012
@@ -323,7 +323,7 @@ public class tdbloader3 extends CmdGener
return bpt2 ;
}
- private void createBPlusTreeIndex(String indexName, final ColumnMap colMap, BPlusTree bpt) {
+ private void createBPlusTreeIndex(final String indexName, final ColumnMap colMap, BPlusTree bpt) {
final int size = indexName.length() ;
if ( ( size != 3 ) && ( size != 4 ) ) throw new AtlasException("Unsupported size.") ;
@@ -343,7 +343,9 @@ public class tdbloader3 extends CmdGener
@Override public Tuple<Long> convert(Record record) {
Long[] ids = new Long[size] ;
for ( int i = 0 ; i < size ; i++ ) {
- ids[colMap.fetchSlotIdx(i)] = Bytes.getLong(record.getKey(), i*SizeOfLong) ;
+ int idx = colMap.mapSlotIdx(i) ;
+ long x = Bytes.getLong(record.getKey(), i*SizeOfLong) ;
+ ids[idx] = x ;
}
monitor.tick() ;
return Tuple.create(ids) ;
Re: svn commit: r1360852 - /jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java
Posted by Paolo Castagna <ca...@googlemail.com>.
Good catch Andy, thanks.
Paolo
On 12/07/12 19:37, andy@apache.org wrote:
> Author: andy
> Date: Thu Jul 12 18:37:37 2012
> New Revision: 1360852
>
> URL: http://svn.apache.org/viewvc?rev=1360852&view=rev
> Log:
> Secondary indexes were generated with the wrong order.
>
> Modified:
> jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java
>
> Modified: jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java
> URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java?rev=1360852&r1=1360851&r2=1360852&view=diff
> ==============================================================================
> --- jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java (original)
> +++ jena/trunk/jena-tdb/src/main/java/tdb/tdbloader3.java Thu Jul 12 18:37:37 2012
> @@ -323,7 +323,7 @@ public class tdbloader3 extends CmdGener
> return bpt2 ;
> }
>
> - private void createBPlusTreeIndex(String indexName, final ColumnMap colMap, BPlusTree bpt) {
> + private void createBPlusTreeIndex(final String indexName, final ColumnMap colMap, BPlusTree bpt) {
> final int size = indexName.length() ;
>
> if ( ( size != 3 ) && ( size != 4 ) ) throw new AtlasException("Unsupported size.") ;
> @@ -343,7 +343,9 @@ public class tdbloader3 extends CmdGener
> @Override public Tuple<Long> convert(Record record) {
> Long[] ids = new Long[size] ;
> for ( int i = 0 ; i < size ; i++ ) {
> - ids[colMap.fetchSlotIdx(i)] = Bytes.getLong(record.getKey(), i*SizeOfLong) ;
> + int idx = colMap.mapSlotIdx(i) ;
> + long x = Bytes.getLong(record.getKey(), i*SizeOfLong) ;
> + ids[idx] = x ;
> }
> monitor.tick() ;
> return Tuple.create(ids) ;
>
>