@@ -1,3 +1,13 @@ +2009-02-13 Mikio Hirabayashi <mikio@users.sourceforge.net> + + * tctdb.c (tctdbgenuidimpl): the meta data format was normalized to the big endian. + + * tctdb.c (tctdbsetuidseed): new function. + + * tcadb.c (tcadbmisc): "get" function of the table database was enhanced. + + - Release: 1.4.6 + 2009-02-02 Mikio Hirabayashi <mikio@users.sourceforge.net> * tchdb.c (tchdbput, tchdbget, tchdbout): bugs related to race condition were fixed. ChangeLog @@ -532,8 +532,8 @@ check-adb : $(RUNENV) $(RUNCMD) ./tcamgr get -sep '\t' casket.tct 1 > check.out $(RUNENV) $(RUNCMD) ./tcamgr list -sep '\t' -pv casket.tct > check.out $(RUNENV) $(RUNCMD) ./tcamgr misc -sep '|' casket.tct search \ - "addcond|name|STRINC|i" "setorder|age|NUMASC" "setmax|1" "columns" > check.out - $(RUNENV) $(RUNCMD) ./tcamgr misc -sep '|' casket.tct search "columns" "out" > check.out + "addcond|name|STRINC|i" "setorder|age|NUMASC" "setmax|1" "get" > check.out + $(RUNENV) $(RUNCMD) ./tcamgr misc -sep '|' casket.tct search "get" "out" > check.out check-valgrind : Makefile.in @@ -60,7 +60,7 @@ static void test_sqlite(void){ if(sqlite3_exec(db, sql, callback, 0, &errmsg) != SQLITE_OK) assert(!__LINE__); for(int j = 1; j <= RECORDNUM; j++){ sprintf(sql, "INSERT INTO tbl VALUES ( '%08d', '%08d', %d, '%08d', %d );", - j, j, myrand() % RECORDNUM, myrand() % RECORDNUM, j); + j, j, myrand() % RECORDNUM, myrand() % RECORDNUM, j); if(sqlite3_exec(db, sql, callback, 0, &errmsg) != SQLITE_OK) assert(!__LINE__); } sprintf(sql, "END TRANSACTION;"); bros/cmpsqltctest.c @@ -301,7 +301,7 @@ int dotblwrite(char *name, int rnum){ return 1; } sprintf(sql, "CREATE TABLE tbl ( key INTEGER PRIMARY KEY, s TEXT, n INTEGER," - " t TEXT, f TEXT );"); + " t TEXT, f TEXT );"); if(sqlite3_exec(db, sql, callback, 0, &errmsg) != SQLITE_OK){ fprintf(stderr, "sqlite3_exec failed: %s\n", errmsg); sqlite3_free(errmsg); @@ -331,7 +331,7 @@ int dotblwrite(char *name, int rnum){ for(i = 1; i <= rnum; i++){ /* store a record */ sprintf(sql, "INSERT INTO tbl VALUES ( %d, '%08d', %d, '%08d', '%08d' );", - i, i, myrand() % i, i, myrand() % rnum); + i, i, myrand() % i, i, myrand() % rnum); if(sqlite3_exec(db, sql, callback, 0, &errmsg) != SQLITE_OK){ fprintf(stderr, "sqlite3_exec failed: %s\n", errmsg); sqlite3_free(errmsg); bros/sqltest.c @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for tokyocabinet 1.4.5. +# Generated by GNU Autoconf 2.61 for tokyocabinet 1.4.6. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. @@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh} # Identity of this package. PACKAGE_NAME='tokyocabinet' PACKAGE_TARNAME='tokyocabinet' -PACKAGE_VERSION='1.4.5' -PACKAGE_STRING='tokyocabinet 1.4.5' +PACKAGE_VERSION='1.4.6' +PACKAGE_STRING='tokyocabinet 1.4.6' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1192,7 +1192,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures tokyocabinet 1.4.5 to adapt to many kinds of systems. +\`configure' configures tokyocabinet 1.4.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1253,7 +1253,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of tokyocabinet 1.4.5:";; + short | recursive ) echo "Configuration of tokyocabinet 1.4.6:";; esac cat <<\_ACEOF @@ -1354,7 +1354,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -tokyocabinet configure 1.4.5 +tokyocabinet configure 1.4.6 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1368,7 +1368,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by tokyocabinet $as_me 1.4.5, which was +It was created by tokyocabinet $as_me 1.4.6, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -1724,7 +1724,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Package information MYLIBVER=7 -MYLIBREV=10 +MYLIBREV=11 MYFORMATVER="1.0" # Targets @@ -6346,7 +6346,7 @@ exec 6>&1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by tokyocabinet $as_me 1.4.5, which was +This file was extended by tokyocabinet $as_me 1.4.6, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6389,7 +6389,7 @@ Report bugs to <bug-autoconf@gnu.org>." _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -tokyocabinet config.status 1.4.5 +tokyocabinet config.status 1.4.6 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" configure @@ -7,11 +7,11 @@ #================================================================ # Package name -AC_INIT(tokyocabinet, 1.4.5) +AC_INIT(tokyocabinet, 1.4.6) # Package information MYLIBVER=7 -MYLIBREV=10 +MYLIBREV=11 MYFORMATVER="1.0" # Targets configure.in @@ -65,7 +65,7 @@ <h1 id="headline">Tokyo Cabinet: a modern implementation of DBM</h1> <div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div> -<div class="note">Last Update: Wed, 07 Jan 2009 01:03:53 +0900</div> +<div class="note">Last Update: Fri, 13 Feb 2009 15:37:50 +0900</div> <div class="navi">[<span class="void">English</span>/<a href="index.ja.html" hreflang="ja">Japanese</a>]</div> <div class="logo"><img src="logo.png" alt="Tokyo Cabinet" width="300" height="110" /></div> @@ -126,7 +126,7 @@ <p>The following are the source packages of Tokyo Cabinet. As for binary packages, see the site of each distributor.</p> <ul> -<li><a href="tokyocabinet-1.4.5.tar.gz">Latest Source Package (version 1.4.5)</a></li> +<li><a href="tokyocabinet-1.4.6.tar.gz">Latest Source Package (version 1.4.6)</a></li> <li><a href="pastpkg/">Past Versions</a></li> </ul> @@ -138,7 +138,10 @@ </ul> <ul> -<li><a href="tyrantpkg/">Remote Service (Tokyo Tyrant)</a></li> +<li><a href="tyrantpkg/">Remote Service (Tokyo Tyrant)</a><ul> +<li><a href="tyrantperlpkg/">Perl Client of Remote Service</a></li> +<li><a href="tyrantrubypkg/">Ruby Client of Remote Service</a></li> +</ul></li> <li><a href="dystopiapkg/">Inverted Index (Tokyo Dystopia)</a></li> </ul> doc/index.html @@ -106,7 +106,7 @@ <h1 id="headline">Tokyo Cabinet: DBMの現代的な壱実装</h1> <div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div> -<div class="note">Last Update: Wed, 07 Jan 2009 01:03:53 +0900</div> +<div class="note">Last Update: Fri, 13 Feb 2009 15:37:50 +0900</div> <div class="navi">[<a href="index.html" hreflang="en">English</a>/<span class="void">Japanese</span>]</div> <div class="logo"><img src="logo-ja.png" alt="Tokyo Cabinet" width="300" height="110" /></div> @@ -167,7 +167,7 @@ <p>以下のソースパッケージをダウンロードしてください。バイナリパッケージについては、各ディストリビュータのサイトをご覧ください。</p> <ul> -<li><a href="tokyocabinet-1.4.5.tar.gz">最新のソースパッケージ（バージョン1.4.5）</a></li> +<li><a href="tokyocabinet-1.4.6.tar.gz">最新のソースパッケージ（バージョン1.4.6）</a></li> <li><a href="pastpkg/">過去のバージョン</a></li> </ul> @@ -179,7 +179,10 @@ </ul> <ul> -<li><a href="tyrantpkg/">リモートサービス（Tokyo Tyrant）</a></li> +<li><a href="tyrantpkg/">リモートサービス（Tokyo Tyrant）</a><ul> +<li><a href="tyrantperlpkg/">リモートサービスのPerlクライアント</a></li> +<li><a href="tyrantrubypkg/">リモートサービスのRubyクライアント</a></li> +</ul></li> <li><a href="dystopiapkg/">転置インデックス（Tokyo Dystopia）</a></li> </ul> doc/index.ja.html @@ -24,7 +24,7 @@ <h1 id="headline">Fundamental Specifications of Tokyo Cabinet Version 1</h1> <div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div> -<div class="note">Last Update: Wed, 07 Jan 2009 01:03:53 +0900</div> +<div class="note">Last Update: Fri, 13 Feb 2009 15:37:50 +0900</div> <div class="navi">[<span class="void">English</span>/<a href="spex-ja.html" hreflang="ja">Japanese</a>] [<a href="index.html">HOME</a>]</div> <hr /> doc/spex-en.html @@ -24,7 +24,7 @@ <h1 id="headline">Tokyo Cabinet第1版基本仕様書</h1> <div class="note">Copyright (C) 2006-2009 Mikio Hirabayashi</div> -<div class="note">Last Update: Wed, 07 Jan 2009 01:03:53 +0900</div> +<div class="note">Last Update: Fri, 13 Feb 2009 15:37:50 +0900</div> <div class="navi">[<a href="spex-en.html" hreflang="en">English</a>/<span class="void">Japanese</span>] [<a href="index.ja.html">HOME</a>]</div> <hr /> @@ -6659,7 +6659,7 @@ cp -f "$srcpath" "$destpath" <p>抽象データベースの接尾辞に ".tct" をつけるとテーブルデータベースになります。テーブルデータベースでは単一の文字列を値とする代わりにコラムの名前と値のマップが用いられます。抽象データベースでテーブルデータベースを扱う場合、単一の文字列とマップを同一のインターフェイスで扱うために、ゼロ文字（'\0'）を区切り文字としてコラムの名前と値を交互に並べて直列化した文字列を用います。レコードを格納する際（`<code>tcadbput</code>'）の引数やレコードを取得する際（`<code>tcadbget</code>'）の戻り値にはそのゼロ区切り文字列が使われます。</p> -<p>レコードの検索は関数 `<code>tcadbmisc</code>' のサブ関数 "search" で行います。引数に "addcond" か "setorder" か "setmax" か "columns" か "out" を接頭させてゼロ文字区切りで演算式を記述した文字列を与えることでクエリを組み立てます。例えば "addcond\0name\0STRBW\0john" と "setorder\0age\0NUMASC" を指定すると、「コラム "name" の値が "john" で始まるレコードをコラム "age" の数値の昇順で取り出す」というクエリになります。戻り値は該当するレコードの主キーのリストです。ただし、"columns" が指定されると、コラム名と値のマップをゼロ区切り文字列で返します。"columns\0name\0age" などとして特定のコラムに絞り込むこともできます。"out" が指定されると、該当のコラムを削除します。"columns" と "out" を組み合わせるとキューとして利用することができます。サブ関数 "genuid" は、ユニークなID番号を採番して返します。</p> +<p>レコードの検索は関数 `<code>tcadbmisc</code>' のサブ関数 "search" で行います。引数に "addcond" か "setorder" か "setmax" か "get" か "out" を接頭させてゼロ文字区切りで演算式を記述した文字列を与えることでクエリを組み立てます。例えば "addcond\0name\0STRBW\0john" と "setorder\0age\0NUMASC" を指定すると、「コラム "name" の値が "john" で始まるレコードをコラム "age" の数値の昇順で取り出す」というクエリになります。戻り値は該当するレコードの主キーのリストです。ただし、"get" が指定されると、コラム名と値のマップをゼロ区切り文字列で返します。"get\0name\0age" などとして特定のコラムに絞り込むこともできます。"out" が指定されると、該当のコラムを削除します。"get" と "out" を組み合わせるとキューとして利用することができます。サブ関数 "genuid" は、ユニークなID番号を採番して返します。</p> <h3 id="tips_tcrdb">リモートインターフェイス</h3> doc/spex-ja.html @@ -1,4 +1,4 @@ -.TH "TCADB" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCADB" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcadb \- the abstract database API man/tcadb.3 @@ -1,4 +1,4 @@ -.TH "TCATEST" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCATEST" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcamgr \- the command line utility of the abstract database API man/tcamgr.1 @@ -1,4 +1,4 @@ -.TH "TCATEST" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCATEST" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcatest \- test cases of the abstract database API man/tcatest.1 @@ -1,4 +1,4 @@ -.TH "TCBDB" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCBDB" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcbdb \- the B+ tree database API man/tcbdb.3 @@ -1,4 +1,4 @@ -.TH "TCBMGR" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCBMGR" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcbmgr \- the command line utility of the B+ tree database API man/tcbmgr.1 @@ -1,4 +1,4 @@ -.TH "TCBMTTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCBMTTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcbmttest \- test cases of the B+ tree database API man/tcbmttest.1 @@ -1,4 +1,4 @@ -.TH "TCBTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCBTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcbtest \- test cases of the B+ tree database API man/tcbtest.1 @@ -1,4 +1,4 @@ -.TH "TCFDB" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCFDB" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcfdb \- the fixed-length database API man/tcfdb.3 @@ -1,4 +1,4 @@ -.TH "TCFMGR" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCFMGR" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcfmgr \- the command line utility of the fixed-length database API man/tcfmgr.1 @@ -1,4 +1,4 @@ -.TH "TCFMTTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCFMTTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcfmttest \- test cases of the fixed-length database API man/tcfmttest.1 @@ -1,4 +1,4 @@ -.TH "TCFTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCFTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcftest \- test cases of the fixed-length database API man/tcftest.1 @@ -1,4 +1,4 @@ -.TH "TCHDB" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCHDB" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tchdb \- the hash database API man/tchdb.3 @@ -1,4 +1,4 @@ -.TH "TCHMGR" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCHMGR" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tchmgr \- the command line utility of the hash database API man/tchmgr.1 @@ -1,4 +1,4 @@ -.TH "TCHMTTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCHMTTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tchmttest \- test cases of the hash database API man/tchmttest.1 @@ -1,4 +1,4 @@ -.TH "TCHTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCHTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tchtest \- test cases of the hash database API man/tchtest.1 @@ -1,4 +1,4 @@ -.TH "TCTDB" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCTDB" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tctdb \- the table database API man/tctdb.3 @@ -1,4 +1,4 @@ -.TH "TCTMGR" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCTMGR" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tctmgr \- the command line utility of the table database API man/tctmgr.1 @@ -1,4 +1,4 @@ -.TH "TCTMTTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCTMTTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tctmttest \- test cases of the table database API man/tctmttest.1 @@ -1,4 +1,4 @@ -.TH "TCTTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCTTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcttest \- test cases of the table database API man/tcttest.1 @@ -1,4 +1,4 @@ -.TH "TCUCODEC" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCUCODEC" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcucodec \- popular encoders and decoders man/tcucodec.1 @@ -1,4 +1,4 @@ -.TH "TCUMTTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCUMTTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcutest \- test cases of the on-memory database API man/tcumttest.1 @@ -1,4 +1,4 @@ -.TH "TCUTEST" 1 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCUTEST" 1 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcutest \- test cases of the utility API man/tcutest.1 @@ -1,4 +1,4 @@ -.TH "TCUTIL" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TCUTIL" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tcutil \- the utility API man/tcutil.3 @@ -1,4 +1,4 @@ -.TH "TOKYOCABINET" 3 "2009-01-07" "Man Page" "Tokyo Cabinet" +.TH "TOKYOCABINET" 3 "2009-02-13" "Man Page" "Tokyo Cabinet" .SH NAME tokyocabinet \- a modern implementation of DBM man/tokyocabinet.3 @@ -1760,7 +1760,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){ const char *maxstr = TCLISTVALPTR(tokens, 1); int64_t max = tcatoi(maxstr); if(max >= 0) tctdbqrysetmax(qry, max); - } else if(!strcmp(cmd, "columns") || !strcmp(cmd, "cols")){ + } else if(!strcmp(cmd, "get") || !strcmp(cmd, "columns")){ if(!cnames) cnames = tclistnew(); for(int j = 1; j < tnum; j++){ const char *token; @@ -1768,7 +1768,7 @@ TCLIST *tcadbmisc(TCADB *adb, const char *name, const TCLIST *args){ TCLISTVAL(token, tokens, j, tsiz); TCLISTPUSH(cnames, token, tsiz); } - } else if(!strcmp(cmd, "out")){ + } else if(!strcmp(cmd, "out") || !strcmp(cmd, "remove")){ toout = true; } } tcadb.c @@ -73,7 +73,7 @@ static bool tctdbtranbeginimpl(TCTDB *tdb); static bool tctdbtrancommitimpl(TCTDB *tdb); static bool tctdbtranabortimpl(TCTDB *tdb); static bool tctdbsetindeximpl(TCTDB *tdb, const char *name, int type); -static int64_t tctdbgenuidimpl(TCTDB *tdb); +static int64_t tctdbgenuidimpl(TCTDB *tdb, int64_t inc); static TCLIST *tctdbqrysearchimpl(TDBQRY *qry); static bool tctdbqryonecondmatch(TDBQRY *qry, TDBCOND *cond, const char *pkbuf, int pksiz); static bool tctdbqryallcondmatch(TDBQRY *qry, const char *pkbuf, int pksiz); @@ -728,7 +728,7 @@ int64_t tctdbgenuid(TCTDB *tdb){ TDBUNLOCKMETHOD(tdb); return -1; } - int64_t rv = tctdbgenuidimpl(tdb); + int64_t rv = tctdbgenuidimpl(tdb, 1); TDBUNLOCKMETHOD(tdb); return rv; } @@ -1067,12 +1067,30 @@ int tctdbinum(TCTDB *tdb){ /* Get the seed of unique ID unumbers of a table database object. */ int64_t tctdbuidseed(TCTDB *tdb){ assert(tdb); + if(!TDBLOCKMETHOD(tdb, false)) return -1; if(!tdb->open){ tctdbsetecode(tdb, TCEINVALID, __FILE__, __LINE__, __func__); - return 0; + TDBUNLOCKMETHOD(tdb); + return -1; } - void *opq = tchdbopaque(tdb->hdb); - return *(int64_t *)opq; + int64_t rv = tctdbgenuidimpl(tdb, 0); + TDBUNLOCKMETHOD(tdb); + return rv; +} + + +/* Set the seed of unique ID unumbers of a table database object. */ +bool tctdbsetuidseed(TCTDB *tdb, int64_t seed){ + assert(tdb && seed >= 0); + if(!TDBLOCKMETHOD(tdb, true)) return -1; + if(!tdb->open || !tdb->wmode){ + tctdbsetecode(tdb, TCEINVALID, __FILE__, __LINE__, __func__); + TDBUNLOCKMETHOD(tdb); + return false; + } + tctdbgenuidimpl(tdb, -seed - 1); + TDBUNLOCKMETHOD(tdb); + return true; } @@ -1886,11 +1904,22 @@ static bool tctdbsetindeximpl(TCTDB *tdb, const char *name, int type){ /* Generate a unique ID number. `tdb' specifies the table database object. + `inc' specifies the increment of the seed. The return value is the new unique ID number or -1 on failure. */ -static int64_t tctdbgenuidimpl(TCTDB *tdb){ +static int64_t tctdbgenuidimpl(TCTDB *tdb, int64_t inc){ assert(tdb); void *opq = tchdbopaque(tdb->hdb); - return ++*(int64_t *)opq; + uint64_t llnum, uid; + if(inc < 0){ + uid = -inc - 1; + } else { + memcpy(&llnum, opq, sizeof(llnum)); + if(inc == 0) return TCITOHLL(llnum); + uid = TCITOHLL(llnum) + inc; + } + llnum = TCITOHLL(uid); + memcpy(opq, &llnum, sizeof(llnum)); + return uid; } tctdb.c @@ -815,6 +815,12 @@ int tctdbinum(TCTDB *tdb); int64_t tctdbuidseed(TCTDB *tdb); +/* Set the seed of unique ID unumbers of a table database object. + `tdb' specifies the table database object connected as a writer. + If successful, the return value is true, else, it is false. */ +bool tctdbsetuidseed(TCTDB *tdb, int64_t seed); + + /* Set the custom codec functions of a table database object. `tdb' specifies the table database object. `enc' specifies the pointer to the custom encoding function. It receives four parameters. tctdb.h @@ -3274,8 +3274,8 @@ typedef struct { /* type of structure for a bit stream o #include <stdio.h> -#define _TC_VERSION "1.4.5" -#define _TC_LIBVER 710 +#define _TC_VERSION "1.4.6" +#define _TC_LIBVER 711 #define _TC_FORMATVER "1.0" enum { /* enumeration for error codes */ tcutil.h 7e11ebcc82bcd82e4600f782155e65dcf6341a7f Bob Ippolito bob@redivi.com http://github.com/etrepum/tokyo-cabinet/commit/280c0f9fbee2f3f0147e7034f215f2c93676fcd3 280c0f9fbee2f3f0147e7034f215f2c93676fcd3

2009-02-15T20:04:24-08:00

sync with tokyocabinet-1.4.6.tar.gz 9f86b5872d3f2f6ad926c924820ce7272815ac25 Bob Ippolito bob@redivi.com