Kill support for Raptor V1

Author: dajobe

INSTALL.html

@@ -160,18 +160,6 @@ <h3>2.2 Options for <tt>configure</tt></h3>
 </p>
 </dd>
 
-<dt><tt>--enable-raptor2</tt><br /></dt>
-<dd><p>Build raptor against the
-beta <a href="http://librdf.org/raptor/">Raptor</a>
-V2 APIs (libraptor2) rather than the default V1 APIs (libraptor).  This
-is a developer option for testing against the raptor 2 beta APIs.  In
-some future version, this will be the default and rasqal will depend
-on raptor2.  When rasqal is built in this way and librdf is built
-against it, librdf also has to be built with a configure
-<code>--enable-raptor</code> option.
-</p>
-</dd>
-
 <dt><tt>--with-memory-signing</tt><br /></dt>
 <dd><p>Enable signing of memory allocations so that when memory is
 allocated with malloc() and released free(), a check is made that the

configure.ac

@@ -305,110 +305,29 @@ if test $have_tm_gmtoff = "yes" ; then
 fi
 
 
-# raptor is REQUIRED despite the checking here
-RAPTOR_MIN_VERSION=1.4.19
-RAPTOR_MAX_VERSION=1.8.99
-RAPTOR2_MIN_VERSION=1.9.2
+# raptor V2 is REQUIRED; --enable-raptor2 option was removed
+RAPTOR_MIN_VERSION=1.9.2
 
-raptor2=no
-AC_ARG_ENABLE(raptor2, [  --enable-raptor2  Enable use of raptor2], raptor2="$enableval", raptor2="no")
-
-AC_SUBST(RAPTOR_MIN_VERSION)
-AC_SUBST(RAPTOR_MAX_VERSION)
 
 AC_CHECK_PROGS(PKG_CONFIG, pkg-config)
 if test "X$PKG_CONFIG" = X; then
-  AC_MSG_WARN(pkg-config not found. configuring raptor 2.0 will require it.  Get it from http://pkg-config.freedesktop.org/)
+  AC_MSG_ERROR(pkg-config not found. configuring raptor V2 requires it.  Get it from http://pkg-config.freedesktop.org/)
 fi
 
 AC_MSG_CHECKING(for raptor)
-RAPTOR_VERSION_DEC=0
-if test "X$PKG_CONFIG" != X; then
-  # When raptor2 is stable, this can be changed to prefer raptor2
-  # For now an explicit configure --enable-raptor2 is required.
-  if test "X$raptor2" = "Xyes"; then
-    RAPTOR_MIN_VERSION=$RAPTOR2_MIN_VERSION
-
-    if $PKG_CONFIG raptor2 --exists; then
-      RAPTOR_CONFIG="$PKG_CONFIG raptor2"
-      RAPTOR_PACKAGE="raptor2"
-    else
-      AC_MSG_ERROR(Raptor2 is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
-    fi
-  else
-    if $PKG_CONFIG raptor --exists; then
-      if $PKG_CONFIG raptor --atleast-version=$RAPTOR_MIN_VERSION --max-version=$RAPTOR_MAX_VERSION; then
-        RAPTOR_CONFIG="$PKG_CONFIG raptor"
-        RAPTOR_PACKAGE="raptor"
-      else
-        AC_MSG_ERROR(Installed raptor $RAPTOR_VERSION is not in supported range - $RAPTOR_MIN_VERSION to $RAPTOR_MAX_VERSION)
-      fi
-    else
-      AC_MSG_ERROR(Raptor is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
-    fi
-  fi
 
-  with_raptor=system
-  RAPTOR_VERSION=`$RAPTOR_CONFIG --modversion 2>/dev/null`
+if $PKG_CONFIG raptor2 --exists; then
+  RAPTOR_VERSION=`$PKG_CONFIG raptor2 --modversion 2>/dev/null`
   RAPTOR_VERSION_DEC=`echo $RAPTOR_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
+  AC_MSG_RESULT(system $RAPTOR_VERSION)
 else
-  # otherwise use raptor-config for raptor V1 only
-  raptor2=no
-  AC_CHECK_PROG(RAPTOR_CONFIG, raptor-config, raptor-config)
-  AC_ARG_WITH(raptor, [  --with-raptor=SOURCE        Pick raptor source - system/internal (default auto)], with_raptor="$withval", with_raptor="auto")
-
-  if test "X$RAPTOR_CONFIG" = X; then
-    with_raptor=internal
-  else
-    RAPTOR_VERSION=`$RAPTOR_CONFIG --version 2>/dev/null`
-
-    RAPTOR_VERSION_DEC=`$RAPTOR_CONFIG --version-decimal 2>/dev/null`
-    RAPTOR_MIN_VERSION_DEC=`echo $RAPTOR_MIN_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-    RAPTOR_MAX_VERSION_DEC=`echo $RAPTOR_MAX_VERSION | $AWK -F. '{printf("%d\n", 10000*$1 + 100*$2 + $3)};'`
-
-    if test "X$with_raptor" = Xauto; then
-      if test "X$RAPTOR_VERSION" != X -a $RAPTOR_VERSION_DEC -ge $RAPTOR_MIN_VERSION_DEC -a $RAPTOR_VERSION_DEC -le $RAPTOR_MAX_VERSION_DEC; then
-	with_raptor=system
-      else
-        AC_MSG_WARN(System raptor $RAPTOR_VERSION is not in supported range - $RAPTOR_MIN_VERSION to $RAPTOR_MAX_VERSION)
-	with_raptor=internal
-      fi
-    elif test $with_raptor = system; then
-      if test $RAPTOR_VERSION_DEC -lt $RAPTOR_MIN_VERSION_DEC -o $RAPTOR_VERSION_DEC -gt $RAPTOR_MAX_VERSION_DEC; then
-        AC_MSG_WARN(System raptor $RAPTOR_VERSION is not in supported range - $RAPTOR_MIN_VERSION to $RAPTOR_MAX_VERSION)
-	AC_MSG_WARN(Proceeding anyway since --with-raptor=system was given)
-	AC_MSG_WARN(To use the internal raptor use --with-raptor=internal)
-	AC_MSG_WARN(or omit any --with-raptor argument.)
-      fi
-    fi
+  AC_MSG_RESULT(not found)
 
-    unset RAPTOR_MIN_VERSION_DEC RAPTOR_MAX_VERSION_DEC
-  fi
-  RAPTOR_PACKAGE="raptor"
+  AC_MSG_ERROR(Raptor V2 is not installed - see http://librdf.org/raptor/ to get a version newer than $RAPTOR_MIN_VERSION)
 fi
-AC_SUBST(with_raptor)
-AC_SUBST(RAPTOR_PACKAGE)
 
-if test $with_raptor = system; then
-  AC_MSG_RESULT(system $RAPTOR_VERSION)
-else
-  RAPTOR_VERSION=internal
-  AC_MSG_RESULT(internal)
-  if test ! -r $srcdir/../raptor/src/raptor_general.c; then
-    AC_MSG_ERROR(Raptor sources missing from $srcdir/../raptor directory - cannot use internal)
-  fi
-fi
 AC_SUBST(RAPTOR_VERSION_DEC)
 
-AM_CONDITIONAL(RAPTOR2, test "X$raptor2" = "Xyes")
-if test "X$raptor2" = "Xyes"; then
-  AC_DEFINE(HAVE_RAPTOR2_API, 1, [Raptor2 API is available])
-  HAVE_RAPTOR2_API=1
-else
-  HAVE_RAPTOR2_API=0
-fi
-AC_SUBST(HAVE_RAPTOR2_API)
-
 
 AC_CHECK_PROG(REDLAND_CONFIG, redland-config, redland-config)
 AC_ARG_WITH(redland-config, [  --with-redland-config=PATH  Location of redland redland-config ()], redland_config="$withval", redland_config="")
@@ -750,28 +669,9 @@ AC_MSG_RESULT($query_engine_version)
 AC_DEFINE_UNQUOTED(RASQAL_QUERY_ENGINE_VERSION, $query_engine_version, [Query engine version])
 
 
-if test $with_raptor = internal; then
-  RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS -I\$(top_srcdir)/../raptor/src"
-  RASQAL_INTERNAL_LIBS="$RASQAL_INTERNAL_LIBS \$(top_builddir)/../raptor/src/libraptor.la"
-  RAPPER_PATH=":\$(top_srcdir)/../raptor/utils"
-else
-  RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$RAPTOR_CONFIG --cflags`"
-  RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$RAPTOR_CONFIG --libs`"
-  RAPPER_PATH=""
-fi
-
-
-oLIBS="$LIBS"
-LIBS="$LIBS $RASQAL_EXTERNAL_LIBS"
-# FIXME remove these raptor checks when RAPTOR2_MIN_VERSION increases
-#  raptor_stringbuffer_append_hexadecimal() is in raptor2 >1.9.0
-AC_CHECK_FUNC(raptor_stringbuffer_append_uri_escaped_counted_string, have_rsauecs=yes, have_rsauecs=no)
-LIBS="$oLIBS"
-
-if test "X$have_rsauecs" = Xyes; then
-  AC_DEFINE(RAPTOR_STRINGBUFFER_APPEND_URI_ESCAPED_COUNTED_STRING, 1, [Have raptor_stringbuffer_append_uri_escaped_counted_string()])
-fi
-
+RASQAL_INTERNAL_CPPFLAGS="$RASQAL_INTERNAL_CPPFLAGS `$PKG_CONFIG raptor2 --cflags`"
+RASQAL_EXTERNAL_LIBS="$RASQAL_EXTERNAL_LIBS `$PKG_CONFIG raptor2 --libs`"
+RAPPER_PATH=""
 
 if test $need_regex_pcre = 1; then
   C=`$PCRE_CONFIG --cflags`

rasqal.pc.in

@@ -3,11 +3,11 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@/@PACKAGE@
 
-have_raptor2_api=@HAVE_RAPTOR2_API@
+have_raptor2_api=1
 
 Name: Rasqal RDF Query Library
 Description: Rasqal RDF Query parsing and execution library
-Requires: @RAPTOR_PACKAGE@ >= @RAPTOR_MIN_VERSION@
+Requires: raptor2 >= @RAPTOR_MIN_VERSION@
 Requires.private: @PKGCONFIG_REQUIRES@
 Version: @VERSION@
 Libs: -L${libdir} -lrasqal

src/rasqal.h.in

@@ -971,20 +971,16 @@ void rasqal_world_set_raptor(rasqal_world* world, raptor_world* raptor_world_ptr
 RASQAL_API
 raptor_world *rasqal_world_get_raptor(rasqal_world* world);
 
-#if @HAVE_RAPTOR2_API@
 RASQAL_API
 void rasqal_world_set_log_handler(rasqal_world* world, void *user_data, raptor_log_handler handler);
-#endif
 
 RASQAL_API
 int rasqal_world_set_default_generate_bnodeid_parameters(rasqal_world* world, char *prefix, int base);
 RASQAL_API
 int rasqal_world_set_generate_bnodeid_handler(rasqal_world* world, void *user_data, rasqal_generate_bnodeid_handler2 handler);
 
-#if @HAVE_RAPTOR2_API@
 RASQAL_API
 const raptor_syntax_description* rasqal_world_get_query_results_format_description(rasqal_world* world, unsigned int counter);
-#endif
 
 RASQAL_API
 const char* rasqal_world_guess_query_results_format_name(rasqal_world* world, raptor_uri *uri, const char *mime_type, const unsigned char *buffer, size_t len, const unsigned char *identifier);
@@ -1022,15 +1018,18 @@ const char* rasqal_query_get_name(rasqal_query* query);
 RASQAL_API
 const char* rasqal_query_get_label(rasqal_query* query);
 
-/* on raptor2: use rasqal_world_set_log_handler() instead of these */
-#if @HAVE_RAPTOR2_API@
+/* This is a typedef to let these deprecated API work with raptor2
+ * which removed this typedef and changed the way error handling was
+ * done.  Use rasqal_world_set_log_handler() on the world class
+ * instead of these functions.
+ */
 typedef void* raptor_message_handler;
-#endif
-RASQAL_API
+
+RASQAL_API RASQAL_DEPRECATED
 void rasqal_query_set_fatal_error_handler(rasqal_query* query, void *user_data, raptor_message_handler handler);
-RASQAL_API
+RASQAL_API RASQAL_DEPRECATED
 void rasqal_query_set_error_handler(rasqal_query* query, void *user_data, raptor_message_handler handler);
-RASQAL_API
+RASQAL_API RASQAL_DEPRECATED
 void rasqal_query_set_warning_handler(rasqal_query* query, void *user_data, raptor_message_handler handler);
 
 RASQAL_API

src/rasqal_algebra.c

@@ -1398,13 +1398,8 @@ rasqal_algebra_get_variables_mentioned_in(rasqal_query* query,
   short *row;
   int i;
 
-#ifdef HAVE_RAPTOR2_API
   seq = raptor_new_sequence((raptor_data_free_handler)rasqal_free_variable,
                             (raptor_data_print_handler)rasqal_variable_print);
-#else
-  seq = raptor_new_sequence((raptor_sequence_free_handler*)rasqal_free_variable,
-                            (raptor_sequence_print_handler*)rasqal_variable_print);
-#endif
   if(!seq)
     return NULL;
 
@@ -1591,22 +1586,12 @@ rasqal_algebra_extract_aggregate_expressions(rasqal_query* query,
                                 /* flags */ 0);
 
   /* Sequence to hold list of aggregate expressions */
-#ifdef HAVE_RAPTOR2_API
   seq = raptor_new_sequence((raptor_data_free_handler)rasqal_free_expression,
                             (raptor_data_print_handler)rasqal_expression_print);
-#else
-  seq = raptor_new_sequence((raptor_sequence_free_handler*)rasqal_free_expression,
-                            (raptor_sequence_print_handler*)rasqal_expression_print);
-#endif
   ae->agg_exprs = seq;
 
-#ifdef HAVE_RAPTOR2_API
   seq = raptor_new_sequence((raptor_data_free_handler)rasqal_free_variable,
                             (raptor_data_print_handler)rasqal_variable_print);
-#else
-  seq = raptor_new_sequence((raptor_sequence_free_handler*)rasqal_free_variable,
-                            (raptor_sequence_print_handler*)rasqal_variable_print);
-#endif
   ae->agg_vars_seq = seq;
 
   /* init internal variable counter */
@@ -1997,13 +1982,8 @@ rasqal_algebra_query_add_projection(rasqal_query* query,
   if(seq)
     vars_size = raptor_sequence_size(seq);
 
-#ifdef HAVE_RAPTOR2_API
   vars_seq = raptor_new_sequence((raptor_data_free_handler)rasqal_free_variable,
                                  (raptor_data_print_handler)rasqal_variable_print);
-#else
-  vars_seq = raptor_new_sequence((raptor_sequence_free_handler*)rasqal_free_variable,
-                                 (raptor_sequence_print_handler*)rasqal_variable_print);
-#endif
   if(!vars_seq) {
     rasqal_free_algebra_node(node);
     return NULL;
@@ -2339,13 +2319,8 @@ main(int argc, char *argv[]) {
   /* This is an artificial order conditions sequence equivalent to
    * ORDER BY 1, 2 which would probably never appear in a query.
    */
-#ifdef HAVE_RAPTOR2_API
   conditions = raptor_new_sequence((raptor_data_free_handler)rasqal_free_expression,
                                    (raptor_data_print_handler)rasqal_expression_print);
-#else
-  conditions = raptor_new_sequence((raptor_sequence_free_handler*)rasqal_free_expression,
-                                   (raptor_sequence_print_handler*)rasqal_expression_print);
-#endif
   if(!conditions)
     FAIL;
   lit3 = rasqal_new_integer_literal(world, RASQAL_LITERAL_INTEGER, 1);

src/rasqal_dataset.c

@@ -131,9 +131,6 @@ rasqal_free_dataset(rasqal_dataset* ds)
 
 static void
 rasqal_dataset_statement_handler(void *user_data,
-#ifndef HAVE_RAPTOR2_API
-                                 const
-#endif
                                  raptor_statement *statement)
 {
   rasqal_dataset* ds;
@@ -162,34 +159,6 @@ rasqal_dataset_statement_handler(void *user_data,
 }
 
 
-#ifndef HAVE_RAPTOR2_API
-/* Raptor V1 only */
-static void
-rasqal_dataset_raptor_error_handler(void *user_data, 
-                                    raptor_locator* locator,
-                                    const char *message)
-{
-  rasqal_world* world = (rasqal_world*)user_data;
-  int locator_len;
-
-  if(locator &&
-     (locator_len = raptor_format_locator(NULL, 0, locator)) > 0
-    ) {
-    char *buffer = (char*)RASQAL_MALLOC(cstring, locator_len + 1);
-    raptor_format_locator(buffer, locator_len, locator);
-
-    rasqal_log_error_simple(world, RAPTOR_LOG_LEVEL_ERROR,
-                            locator,
-                            "Failed to parse %s - %s", buffer, message);
-    RASQAL_FREE(cstring, buffer);
-  } else
-    rasqal_log_error_simple(world, RAPTOR_LOG_LEVEL_ERROR,
-                            locator,
-                            "Failed to parse - %s", message);
-}
-#endif
-
-
 int
 rasqal_dataset_load_graph_iostream(rasqal_dataset* ds,
                                    const char* format_name,
@@ -223,24 +192,12 @@ rasqal_dataset_load_graph_iostream(rasqal_dataset* ds,
     format_name = "guess";
 
   /* parse iostr with parser and base_uri */
-#ifdef HAVE_RAPTOR2_API
   parser = raptor_new_parser(ds->world->raptor_world_ptr, format_name);
   raptor_parser_set_statement_handler(parser, ds,
                                       rasqal_dataset_statement_handler);
-#else
-  parser = raptor_new_parser(format_name);
-  raptor_set_statement_handler(parser, ds,
-                               rasqal_dataset_statement_handler);
-  raptor_set_error_handler(parser, ds->world,
-                           rasqal_dataset_raptor_error_handler);
-#endif
 
   /* parse and store triples */
-#ifdef HAVE_RAPTOR2_API
   raptor_parser_parse_iostream(parser, iostr, base_uri);
-#else
-  rasqal_raptor_parse_iostream(parser, iostr, base_uri);
-#endif
 
   raptor_free_parser(parser);