Permalink
Browse files

sync with tokyotyrant-1.1.17.tar.gz

  • Loading branch information...
etrepum committed Mar 13, 2009
1 parent 045a7c3 commit 264d1c6ce065031ca27a0b1176b0507dd1a185e3
Showing with 221 additions and 98 deletions.
  1. +12 −0 ChangeLog
  2. +24 −19 configure
  3. +13 −9 configure.in
  4. +7 −5 doc/index.html
  5. +1 −1 example/tcrdbtblex.c
  6. +50 −16 man/hoge
  7. +6 −3 man/tcrdb.3
  8. +3 −1 man/ttserver.1
  9. +5 −3 tcrdb.c
  10. +6 −3 tcrdb.h
  11. +2 −2 tcrtest.c
  12. +52 −21 ttserver.c
  13. +30 −10 ttutil.c
  14. +10 −5 ttutil.h
View
@@ -1,3 +1,15 @@
+2009-02-19 Mikio Hirabayashi <mikio@users.sourceforge.net>
+
+ * ttutil.c (tthttpfetch): timeout mechanism was added.
+
+ * ttserver.c (do_mc_delete): mismatch of the error message was resolved.
+
+ * ttserver.c (do_mc_incr, do_mc_decr): behavior became as with the original memcached.
+
+ * tcrdb.c (tcrdbqrysetlimit): new function instead of "tcrdbqrysetmax".
+
+ - Release: 1.1.17
+
2009-02-16 Mikio Hirabayashi <mikio@users.sourceforge.net>
* tcrdb.h: the macro "RDBITOPT" was added.
View
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for tokyotyrant 1.1.16.
+# Generated by GNU Autoconf 2.61 for tokyotyrant 1.1.17.
#
# 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='tokyotyrant'
PACKAGE_TARNAME='tokyotyrant'
-PACKAGE_VERSION='1.1.16'
-PACKAGE_STRING='tokyotyrant 1.1.16'
+PACKAGE_VERSION='1.1.17'
+PACKAGE_STRING='tokyotyrant 1.1.17'
PACKAGE_BUGREPORT=''
# Factoring default headers for most tests.
@@ -1194,7 +1194,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 tokyotyrant 1.1.16 to adapt to many kinds of systems.
+\`configure' configures tokyotyrant 1.1.17 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1255,7 +1255,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of tokyotyrant 1.1.16:";;
+ short | recursive ) echo "Configuration of tokyotyrant 1.1.17:";;
esac
cat <<\_ACEOF
@@ -1349,7 +1349,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-tokyotyrant configure 1.1.16
+tokyotyrant configure 1.1.17
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1363,7 +1363,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 tokyotyrant $as_me 1.1.16, which was
+It was created by tokyotyrant $as_me 1.1.17, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1718,8 +1718,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# Package information
-MYLIBVER=2
-MYLIBREV=7
+MYLIBVER=3
+MYLIBREV=1
MYPROTVER="0.9"
# Targets
@@ -1746,9 +1746,8 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
MYPOSTCMD="true"
# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
CPATH="$HOME/include:/usr/local/include:$CPATH"
LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
@@ -1915,11 +1914,6 @@ printf '#================================================================\n'
# Checking Commands and Libraries
#================================================================
-# Reset variables
-test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS"
-test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
-test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
-
# C compiler
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -2841,6 +2835,17 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
ac_compiler_gnu=$ac_cv_c_compiler_gnu
+# Reset variables
+if test "$GCC" != "yes"
+then
+ { echo "$as_me:$LINENO: WARNING: another compiler except for GCC was detected" >&5
+echo "$as_me: WARNING: another compiler except for GCC was detected" >&2;}
+ MYCFLAGS=""
+fi
+test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS"
+test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
+test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
+
# Byte order
ac_ext=c
@@ -5907,7 +5912,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 tokyotyrant $as_me 1.1.16, which was
+This file was extended by tokyotyrant $as_me 1.1.17, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5950,7 +5955,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-tokyotyrant config.status 1.1.16
+tokyotyrant config.status 1.1.17
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
View
@@ -7,11 +7,11 @@
#================================================================
# Package name
-AC_INIT(tokyotyrant, 1.1.16)
+AC_INIT(tokyotyrant, 1.1.17)
# Package information
-MYLIBVER=2
-MYLIBREV=7
+MYLIBVER=3
+MYLIBREV=1
MYPROTVER="0.9"
# Targets
@@ -38,9 +38,8 @@ MYLDLIBPATHENV="LD_LIBRARY_PATH"
MYPOSTCMD="true"
# Building paths
-pathtmp="$PATH"
-PATH="$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-PATH="$PATH:/usr/ccs/bin:/usr/ucb:/usr/xpg4/bin:/usr/xpg6/bin:$pathtmp"
+PATH="$PATH:$HOME/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+PATH="$PATH:/opt/SUNWspro/bin:/usr/ccs/bin:/usr/xpg4/bin:/usr/xpg6/bin:/usr/ucb"
CPATH="$HOME/include:/usr/local/include:$CPATH"
LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LIBRARY_PATH"
LD_LIBRARY_PATH="$HOME/lib:/usr/local/lib:$LD_LIBRARY_PATH"
@@ -177,14 +176,19 @@ printf '#================================================================\n'
# Checking Commands and Libraries
#================================================================
+# C compiler
+AC_PROG_CC
+
# Reset variables
+if test "$GCC" != "yes"
+then
+ AC_MSG_WARN([another compiler except for GCC was detected])
+ MYCFLAGS=""
+fi
test -n "$CFLAGS" && MYCFLAGS="$CFLAGS $MYCFLAGS"
test -n "$CPPFLAGS" && MYCPPFLAGS="$CPPFLAGS $MYCPPFLAGS"
test -n "$LDFLAGS" && MYLDFLAGS="$LDFLAGS $MYLDFLAGS"
-# C compiler
-AC_PROG_CC
-
# Byte order
AC_C_BIGENDIAN(MYCPPFLAGS="$MYCPPFLAGS -D_MYBIGEND")
View
@@ -262,7 +262,7 @@ <h3 id="serverprog_ttserver">ttserver</h3>
<p>The command `<code>ttserver</code>' runs the server managing a database instance. Because the database is treated by the abstract API of Tokyo Cabinet, you can choose the scheme on start-up of the server. Supported schema are on-memory hash database, on-memory tree database, hash database, and B+ tree database. This command is used in the following format. `<var>dbname</var>' specifies the database name. If it is omitted, on-memory hash database is specified.</p>
<dl class="api">
-<dt><code>ttserver [-host <var>name</var>] [-port <var>num</var>] [-th<var>num</var> <var>num</var>] [-tout <var>num</var>] [-dmn] [-pid <var>path</var>] [-log <var>path</var>] [-ld|-le] [-ulog <var>path</var>] [-ulim <var>num</var>] [-uas] [-sid <var>num</var>] [-mhost <var>name</var>] [-mport <var>num</var>] [-rts <var>path</var>] [-ext <var>path</var>] [-extpc <var>name</var> <var>period</var>] [-mask <var>expr</var>] [<var>dbname</var>]</code></dt>
+<dt><code>ttserver [-host <var>name</var>] [-port <var>num</var>] [-th<var>num</var> <var>num</var>] [-tout <var>num</var>] [-dmn] [-pid <var>path</var>] [-kl] [-log <var>path</var>] [-ld|-le] [-ulog <var>path</var>] [-ulim <var>num</var>] [-uas] [-sid <var>num</var>] [-mhost <var>name</var>] [-mport <var>num</var>] [-rts <var>path</var>] [-ext <var>path</var>] [-extpc <var>name</var> <var>period</var>] [-mask <var>expr</var>] [<var>dbname</var>]</code></dt>
</dl>
<p>Options feature the following.</p>
@@ -274,6 +274,7 @@ <h3 id="serverprog_ttserver">ttserver</h3>
<li><code>-tout <var>num</var></code> : specify the timeout of each session in seconds. By default, no timeout is specified.</li>
<li><code>-dmn</code> : work as a daemon process.</li>
<li><code>-pid <var>path</var></code> : output the process ID into the file.</li>
+<li><code>-kl</code> : kill the existing process if the process ID file is detected.</li>
<li><code>-log <var>path</var></code> : output log messages into the file.</li>
<li><code>-ld</code> : log debug messages also.</li>
<li><code>-le</code> : log error messages only.</li>
@@ -1035,12 +1036,13 @@ <h3 id="tcrdbapi_apitbl">API of the Table Extension</h3>
<dd>`<var>type</var>' specifies the order type: `RDBQOSTRASC' for string ascending, `RDBQOSTRDESC' for string descending, `RDBQONUMASC' for number ascending, `RDBQONUMDESC' for number descending.</dd>
</dl>
-<p>The function `tcrdbqrysetmax' is used in order to set the maximum number of records of the result of a query object.</p>
+<p>The function `tcrdbqrysetlimit' is used in order to set the limit number of records of the result of a query object.</p>
<dl class="api">
-<dt><code>void tcrdbqrysetmax(RDBQRY *<var>qry</var>, int <var>max</var>);</code></dt>
+<dt><code>void tcrdbqrysetlimit(RDBQRY *<var>qry</var>, int <var>max</var>, int <var>skip</var>);</code></dt>
<dd>`<var>qry</var>' specifies the query object.</dd>
-<dd>`<var>max</var>' specifies the maximum number of records of the result.</dd>
+<dd>`<var>max</var>' specifies the maximum number of records of the result. If it is negative, no limit is specified.</dd>
+<dd>`<var>skip</var>' specifies the number of skipped records of the result. If it is not more than 0, no record is skipped.</dd>
</dl>
<p>The function `tcrdbqrysearch' is used in order to execute the search of a query object.</p>
@@ -1186,7 +1188,7 @@ <h3 id="tcrdbapi_example">Example Code</h3>
tcrdbqryaddcond(qry, "age", RDBQCNUMGE, "20");
tcrdbqryaddcond(qry, "lang", RDBQCSTROR, "ja,en");
tcrdbqrysetorder(qry, "name", RDBQOSTRASC);
- tcrdbqrysetmax(qry, 10);
+ tcrdbqrysetlimit(qry, 10, 0);
res = tcrdbqrysearch(qry);
for(i = 0; i &lt; tclistnum(res); i++){
rbuf = tclistval(res, i, &amp;rsiz);
View
@@ -48,7 +48,7 @@ int main(int argc, char **argv){
tcrdbqryaddcond(qry, "age", RDBQCNUMGE, "20");
tcrdbqryaddcond(qry, "lang", RDBQCSTROR, "ja,en");
tcrdbqrysetorder(qry, "name", RDBQOSTRASC);
- tcrdbqrysetmax(qry, 10);
+ tcrdbqrysetlimit(qry, 10, 0);
res = tcrdbqrysearch(qry);
for(i = 0; i < tclistnum(res); i++){
rbuf = tclistval(res, i, &rsiz);
Oops, something went wrong.

0 comments on commit 264d1c6

Please sign in to comment.