Tritonn

[Tritonn-commit 156] [svn] [171] added configure option "--enable-abort" for SQL query abortion of senna.

svnno****@sourc***** svnno****@sourc*****
2008年 12月 1日 (月) 17:35:27 JST

• 前の記事 [Tritonn-commit 155] [svn] [170] SQL query abort patch.
• 次の記事 [Tritonn-commit 157] [svn] [172] added version check for libsenna in configure.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]

Revision: 171
          http://svn.sourceforge.jp/view?root=tritonn&view=rev&rev=171
Author:   mir
Date:     2008-12-01 17:35:27 +0900 (Mon, 01 Dec 2008)

Log Message:
-----------
added configure option "--enable-abort" for SQL query abortion of senna.

Modified Paths:
--------------
    tags/tritonn-1.0.12-mysql-5.0.67/configure
    tags/tritonn-1.0.12-mysql-5.0.67/configure.in


-------------- next part --------------
Modified: tags/tritonn-1.0.12-mysql-5.0.67/configure
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.67/configure	2008-12-01 08:11:56 UTC (rev 170)
+++ tags/tritonn-1.0.12-mysql-5.0.67/configure	2008-12-01 08:35:27 UTC (rev 171)
@@ -1063,6 +1063,7 @@
   --enable-local-infile   Enable LOAD DATA LOCAL INFILE (default: disabled)
   --disable-grant-options Disables the use of --init-file, --skip-grant-tables and --bootstrap options
   --disable-largefile     Omit support for large files
+  --enable-abort          enable query abortion for senna. [default=no]
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -5954,7 +5955,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5957 "configure"' > conftest.$ac_ext
+  echo '#line 5958 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6828,7 +6829,7 @@
 
 
 # Provide some information about the compiler.
-echo "$as_me:6831:" \
+echo "$as_me:6832:" \
      "checking for Fortran 77 compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
 { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
@@ -7862,11 +7863,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7865: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7866: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7869: \$? = $ac_status" >&5
+   echo "$as_me:7870: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8095,11 +8096,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8098: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8099: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8102: \$? = $ac_status" >&5
+   echo "$as_me:8103: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -8155,11 +8156,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8158: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8159: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8162: \$? = $ac_status" >&5
+   echo "$as_me:8163: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9489,7 +9490,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 9492 "configure"' > conftest.$ac_ext
+    echo '#line 9493 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10360,7 +10361,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10363 "configure"
+#line 10364 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10458,7 +10459,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10461 "configure"
+#line 10462 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12637,11 +12638,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12640: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12641: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:12644: \$? = $ac_status" >&5
+   echo "$as_me:12645: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -12697,11 +12698,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:12700: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:12701: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:12704: \$? = $ac_status" >&5
+   echo "$as_me:12705: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13208,7 +13209,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 13211 "configure"' > conftest.$ac_ext
+    echo '#line 13212 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -14079,7 +14080,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14082 "configure"
+#line 14083 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14177,7 +14178,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 14180 "configure"
+#line 14181 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15004,11 +15005,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15007: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15008: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15011: \$? = $ac_status" >&5
+   echo "$as_me:15012: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -15064,11 +15065,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15067: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15068: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15071: \$? = $ac_status" >&5
+   echo "$as_me:15072: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -16378,7 +16379,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 16381 "configure"' > conftest.$ac_ext
+    echo '#line 16382 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -17119,11 +17120,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17122: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17123: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17126: \$? = $ac_status" >&5
+   echo "$as_me:17127: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17352,11 +17353,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17355: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17356: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17359: \$? = $ac_status" >&5
+   echo "$as_me:17360: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -17412,11 +17413,11 @@
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17415: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17416: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17419: \$? = $ac_status" >&5
+   echo "$as_me:17420: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -18746,7 +18747,7 @@
   libsuff=
   case "$host_cpu" in
   x86_64*|s390x*|powerpc64*)
-    echo '#line 18749 "configure"' > conftest.$ac_ext
+    echo '#line 18750 "configure"' > conftest.$ac_ext
     if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -19617,7 +19618,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19620 "configure"
+#line 19621 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -19715,7 +19716,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 19718 "configure"
+#line 19719 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23458,6 +23459,101 @@
 
 
 
+# SQL query abort for senna
+echo "$as_me:$LINENO: checking whether enable abort" >&5
+echo $ECHO_N "checking whether enable abort... $ECHO_C" >&6
+# Check whether --enable-abort or --disable-abort was given.
+if test "${enable_abort+set}" = set; then
+  enableval="$enable_abort"
+
+else
+  enable_abort="no"
+fi;
+if test "x$enable_abort" != "xno"; then
+  echo "$as_me:$LINENO: checking for sen_index_set_abort_callback in -lsenna" >&5
+echo $ECHO_N "checking for sen_index_set_abort_callback in -lsenna... $ECHO_C" >&6
+if test "${ac_cv_lib_senna_sen_index_set_abort_callback+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lsenna  $LIBS"
+cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h.  */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h.  */
+
+/* Override any gcc2 internal prototype to avoid an error.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+/* We use char because int might match the return type of a gcc2
+   builtin and then its argument prototype would still apply.  */
+char sen_index_set_abort_callback ();
+int
+main ()
+{
+sen_index_set_abort_callback ();
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+  (eval $ac_link) 2>conftest.er1
+  ac_status=$?
+  grep -v '^ *+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; } &&
+	 { ac_try='test -s conftest$ac_exeext'
+  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:$LINENO: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  ac_cv_lib_senna_sen_index_set_abort_callback=yes
+else
+  echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ac_cv_lib_senna_sen_index_set_abort_callback=no
+fi
+rm -f conftest.err conftest.$ac_objext \
+      conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+echo "$as_me:$LINENO: result: $ac_cv_lib_senna_sen_index_set_abort_callback" >&5
+echo "${ECHO_T}$ac_cv_lib_senna_sen_index_set_abort_callback" >&6
+if test $ac_cv_lib_senna_sen_index_set_abort_callback = yes; then
+
+
+cat >>confdefs.h <<\_ACEOF
+#define USE_QUERY_ABORT 1
+_ACEOF
+
+
+else
+
+    { { echo "$as_me:$LINENO: error: sen_index_set_abort_callback was not found! Check your Senna build option." >&5
+echo "$as_me: error: sen_index_set_abort_callback was not found! Check your Senna build option." >&2;}
+   { (exit 1); exit 1; }; }
+
+fi
+
+fi
+echo "$as_me:$LINENO: result: $enable_abort" >&5
+echo "${ECHO_T}$enable_abort" >&6
+
 #--------------------------------------------------------------------
 # Check for system header files
 #--------------------------------------------------------------------

Modified: tags/tritonn-1.0.12-mysql-5.0.67/configure.in
===================================================================
--- tags/tritonn-1.0.12-mysql-5.0.67/configure.in	2008-12-01 08:11:56 UTC (rev 170)
+++ tags/tritonn-1.0.12-mysql-5.0.67/configure.in	2008-12-01 08:35:27 UTC (rev 171)
@@ -931,6 +931,22 @@
 AC_SUBST([SENNA_INCLUDES])
 AC_SUBST([SENNA_LIBS])
 
+# SQL query abort for senna
+AC_MSG_CHECKING([whether enable abort])
+AC_ARG_ENABLE(abort,
+  [AC_HELP_STRING([--enable-abort],
+    [enable query abortion for senna. [default=no]])],
+  ,
+  [enable_abort="no"])
+if test "x$enable_abort" != "xno"; then
+  AC_CHECK_LIB(senna, sen_index_set_abort_callback,[
+    AC_DEFINE(USE_QUERY_ABORT, [1], [use SQL query abort for senna])
+  ], [
+    AC_MSG_ERROR([sen_index_set_abort_callback was not found! Check your Senna build option.])
+  ])
+fi
+AC_MSG_RESULT($enable_abort)
+
 #--------------------------------------------------------------------
 # Check for system header files
 #--------------------------------------------------------------------

• 前の記事 [Tritonn-commit 155] [svn] [170] SQL query abort patch.
• 次の記事 [Tritonn-commit 157] [svn] [172] added version check for libsenna in configure.
• 記事の並び順: [ 日付 ] [ スレッド ] [ 件名 ] [ 著者 ]