Merge branch 'devel_multireader_dense' into devel

* devel_multireader_dense: (27 commits)
  fix submessage counter
  skip invalid requests
  fix timertag table
  reimplement active_reports table
  make sure we get no empty strings at all
  use a hack for empty strings, since "" is already reserved
  remove unnecessary code
  add rusage to active_reports table
  add active_reports virtual table
  fix minor memleak
  switch to dense/sparse hash instead of Judy
  cosmetics
  make use of pinba_map
  fix histogram views
  add missing files
  bundle Google Sparse/Dense Hash lib properly
  use XXHash
  working multithreaded reader implementation
  use dense hash for dictionary
  more dense hashes
  ...

Conflicts:
	src/ha_pinba.cc

Makefile.am

@@ -1,4 +1,4 @@
 AUTOMAKE_OPTIONS=foreign no-dependencies
-SUBDIRS = src
+SUBDIRS = sparsehash src
 EXTRA_DIST = NEWS pinba.proto autorevision.sh
 dist_pkgdata_DATA = README default_tables.sql

configure.ac

@@ -4,6 +4,8 @@ AM_CONFIG_HEADER(src/config.h)
 AX_PREFIX_CONFIG_H([src/pinba_config.h])
 AM_INIT_AUTOMAKE
 
+AC_CONFIG_SUBDIRS([sparsehash])
+
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CXXCPP
@@ -23,11 +25,10 @@ AC_PROG_AWK
 AC_CHECK_FUNCS([strndup sysconf recvmmsg])
 
 changequote({,})
-CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -fno-exceptions -fno-rtti//g'`
 CXXFLAGS=`echo "$CXXFLAGS" | sed -e 's/ -DMYSQL_DYNAMIC_PLUGIN -DNDEBUG//g'`
 CFLAGS=`echo "$CFLAGS" | sed -e 's/ -DNDEBUG//g'`
 changequote([,])
-CXXFLAGS="$CXXFLAGS -fno-exceptions -fno-rtti -DMYSQL_DYNAMIC_PLUGIN -DNDEBUG"
+CXXFLAGS="$CXXFLAGS -DMYSQL_DYNAMIC_PLUGIN -DNDEBUG"
 CFLAGS="$CFLAGS -DNDEBUG"
 
 AX_CONFIG_NICE([config.nice])
@@ -196,59 +197,6 @@ AC_ARG_ENABLE(static-build,
 )
 dnl }}}
 
-dnl {{{ --with-judy
-AC_ARG_WITH(judy,
-  [AS_HELP_STRING([--with-judy],[specify Judy install prefix])
-  ],
-  [ ],
-  [with_judy=yes]
-)
-
-if test "x$with_judy" = "xno"; then
-  AC_MSG_ERROR([can't continue without Judy])
-else
-  AC_MSG_CHECKING([Judy install prefix])
-
-  if test "x$with_judy" = "xyes"; then
-    for i in `echo "$STANDARD_PREFIXES"`; do
-      if test -f "$i/include/Judy.h"; then
-        JUDY_DIR="$i"
-        break;
-      fi
-    done
-  else
-
-    with_judy=`dir_resolve "$with_judy"`
-
-    if test -f "$with_judy/include/Judy.h"; then
-      JUDY_DIR="$with_judy"
-    else
-      AC_MSG_ERROR([Can't find Judy headers under $with_judy directory]);
-    fi
-  fi
-
-  if test "x$JUDY_DIR" = "x"; then
-    AC_MSG_ERROR([Unable to locate Judy headers, please use --with-judy=<DIR>]);
-  fi
-
-  AC_MSG_RESULT([$JUDY_DIR])
-
-  CXXFLAGS="$CXXFLAGS -I$JUDY_DIR/include"
-  CFLAGS="$CFLAGS -I$JUDY_DIR/include"
-
-  if test "$FORCE_STATIC_BUILD" = "yes"; then
-    LIBS="$LIBS $JUDY_DIR/$LIBDIR/libJudy.a"
-  else
-    LDFLAGS="$LDFLAGS -L$JUDY_DIR/$LIBDIR"
-    LIBS="$LIBS -lJudy"
-
-    if test "$PINBA_RPATH" != "no"; then
-      LDFLAGS="$LDFLAGS $ld_runpath_switch$JUDY_DIR/$LIBDIR"
-    fi
-  fi
-fi
-dnl }}}
-
 dnl {{{ --enable-debug
 AC_ARG_ENABLE(debug,
   [AS_HELP_STRING([--enable-debug],[enable debugging symbols and compile flags])
@@ -286,7 +234,6 @@ if test x"$debug" = xyes ; then
   INSTALL_STRIP_FLAG=""
 else
   AC_DEFINE([DEBUG_OFF], [1], [debug is off])
-  ADD_FLAGS="-DJUDYERROR_NOTEST"
 
   dnl Make sure to strip symbols from non-developer object files.
   INSTALL_STRIP_FLAG="-s"

sparsehash/AUTHORS

@@ -0,0 +1,2 @@
+google-sparsehash@googlegroups.com
+

sparsehash/COPYING

@@ -0,0 +1,28 @@
+Copyright (c) 2005, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+    * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+    * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+    * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.