Commit 264af7d4 authored by Andreas Tille's avatar Andreas Tille
Browse files

New upstream version 2.9.1-1+dfsg

parent 6284c402

CHANGES.md

+6 −0
Original line number Diff line number Diff line 
# NCBI External Developer Release:



## NCBI VDB 2.9.1-1

**June 25, 2018**



  **ncbi-vdb**: fixed break of binary compatibility introduced in release 2.9.1





## NCBI VDB 2.9.1

**June 15, 2018**

interfaces/kfc/rc.h

+2 −1
Original line number Diff line number Diff line
@@ -161,8 +161,9 @@ RC_ENUM ( RCTarget ) 
    RC_ENTRY ( rcData, "data" )

    RC_ENTRY ( rcQuery, "query" )

    RC_ENTRY ( rcUri, "uri" )

    RC_ENTRY ( rcHashtable, "hashtable" )

    RC_LAST  ( rcLastTarget_v1_1 )

// WARNING: RCObject requires rcLastTarget_v1_1 to be forever constant for ABI

// compatibility.

};



/* RCContext

interfaces/klib/rc.h

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ KLIB_EXTERN bool CC GetUnreadRCInfo ( rc_t *rc, const char **filename, const cha 
    assert ( ( int ) rcLastContext_v1_1  <= ( 1 << 7 ) )



#define ASSERT_OBJ_STATE() \

    assert ( ( int ) rcLink == ( int ) rcHashtable + 1 ),              \

    assert ( ( int ) rcLink == ( int ) rcUri + 1 ),              \

    assert ( ( int ) rcItem == ( int ) rcLibrary + 1 ),          \

    assert ( ( int ) rcOpen == ( int ) rcOutofrange + 1 ),       \

    assert ( ( int ) rcLastObject_v1_1  <= ( 1 << 8 ) ),         \

libs/kdb/libkdb.vers.h

+1 −1
Original line number Diff line number Diff line
@@ -24,4 +24,4 @@ 
*

*/



#define LIBKDB_VERS 0x02070019
 
#define LIBKDB_VERS 0x0207001A

libs/klib/hashfile.c

+10 −10
Original line number Diff line number Diff line
@@ -420,7 +420,7 @@ static rc_t rehash_segment( KHashFile * self, size_t segment, size_t capacity ) 
        = (Hashtable *)seg_alloc( self, segment, sizeof( Hashtable ) );

    if ( !new_hashtable )

    {

        return RC( rcCont, rcHashtable, rcInserting, rcMemory, rcExhausted );

        return RC( rcCont, rcTrie, rcInserting, rcMemory, rcExhausted );

    }



    new_hashtable->table_sz = capacity;
@@ -428,7 +428,7 @@ static rc_t rehash_segment( KHashFile * self, size_t segment, size_t capacity ) 
        = seg_alloc( self, segment, capacity * sizeof( u8 * ) );

    if ( !new_hashtable->table )

    {

        return RC( rcCont, rcHashtable, rcInserting, rcMemory, rcExhausted );

        return RC( rcCont, rcTrie, rcInserting, rcMemory, rcExhausted );

    }



    if ( old_hashtable )
@@ -476,14 +476,14 @@ static rc_t rehash_segment( KHashFile * self, size_t segment, size_t capacity ) 
LIB_EXPORT rc_t KHashFileMake( KHashFile ** self, KFile * hashfile )

{

    if ( self == NULL )

        return RC( rcCont, rcHashtable, rcConstructing, rcParam, rcInvalid );

        return RC( rcCont, rcTrie, rcConstructing, rcParam, rcInvalid );



    rc_t rc;

    *self = NULL;



    KHashFile * kht = (KHashFile *)malloc( sizeof( KHashFile ) );

    if ( kht == NULL )

        return RC( rcCont, rcHashtable, rcConstructing, rcMemory, rcExhausted );

        return RC( rcCont, rcTrie, rcConstructing, rcMemory, rcExhausted );



    kht->file = hashfile;

#if _ARCH_BITS == 32
@@ -581,7 +581,7 @@ LIB_EXPORT bool KHashFileFind( const KHashFile * self, const void * key, 
                               void * value, size_t * value_size )

{

    if ( self == NULL )

        return RC( rcCont, rcHashtable, rcInserting, rcParam, rcInvalid );

        return RC( rcCont, rcTrie, rcInserting, rcParam, rcInvalid );



    size_t            triangle  = 0;

    uint64_t          bucket    = keyhash;
@@ -648,10 +648,10 @@ LIB_EXPORT rc_t KHashFileAdd( KHashFile * self, const void * key, 
                              const void * value, const size_t value_size )

{

    if ( self == NULL )

        return RC( rcCont, rcHashtable, rcInserting, rcParam, rcInvalid );

        return RC( rcCont, rcTrie, rcInserting, rcParam, rcInvalid );



    if ( key == NULL || key_size == 0 )

        return RC( rcCont, rcHashtable, rcInserting, rcParam, rcInvalid );

        return RC( rcCont, rcTrie, rcInserting, rcParam, rcInvalid );

    size_t    triangle = 0;

    uint64_t  bucket   = keyhash;

    size_t    segment  = which_segment( bucket );
@@ -680,7 +680,7 @@ LIB_EXPORT rc_t KHashFileAdd( KHashFile * self, const void * key, 
        {

            void * buf = seg_alloc( self, segment, kvsize );

            if ( !buf )

                return RC( rcCont, rcHashtable, rcInserting, rcMemory,

                return RC( rcCont, rcTrie, rcInserting, rcMemory,

                           rcExhausted );

            hkv_encode( &hkv, buf );
@@ -751,7 +751,7 @@ LIB_EXPORT rc_t KHashFileAdd( KHashFile * self, const void * key, 


                    void * buf = seg_alloc( self, segment, kvsize );

                    if ( !buf )

                        return RC( rcCont, rcHashtable, rcInserting, rcMemory,

                        return RC( rcCont, rcTrie, rcInserting, rcMemory,

                                   rcExhausted );

                    hkv_encode( &hkv, buf );
@@ -772,7 +772,7 @@ LIB_EXPORT bool KHashFileDelete( KHashFile * self, const void * key, 
                                 const size_t key_size, uint64_t keyhash )

{

    if ( self == NULL )

        return RC( rcCont, rcHashtable, rcInserting, rcParam, rcInvalid );

        return RC( rcCont, rcTrie, rcInserting, rcParam, rcInvalid );



    size_t    triangle = 0;

    uint64_t  bucket   = keyhash;