From 253478d12e951e09479c79ae4c215a840ef28682 Mon Sep 17 00:00:00 2001 From: Stephan Bosch Date: Tue, 8 Oct 2019 18:56:53 +0200 Subject: [PATCH] plugins: fts-solr: Move definition of struct solr_result from solr-connection.h to solr-response.h. --- src/plugins/fts-solr/Makefile.am | 1 + src/plugins/fts-solr/solr-connection.h | 10 +--------- src/plugins/fts-solr/solr-response.h | 14 ++++++++++++++ 3 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 src/plugins/fts-solr/solr-response.h diff --git a/src/plugins/fts-solr/Makefile.am b/src/plugins/fts-solr/Makefile.am index 18367f7837..522202e884 100644 --- a/src/plugins/fts-solr/Makefile.am +++ b/src/plugins/fts-solr/Makefile.am @@ -30,4 +30,5 @@ lib21_fts_solr_plugin_la_SOURCES = \ noinst_HEADERS = \ fts-solr-plugin.h \ + solr-response.h \ solr-connection.h diff --git a/src/plugins/fts-solr/solr-connection.h b/src/plugins/fts-solr/solr-connection.h index 0c400da1d1..165f6b5eeb 100644 --- a/src/plugins/fts-solr/solr-connection.h +++ b/src/plugins/fts-solr/solr-connection.h @@ -1,19 +1,11 @@ #ifndef SOLR_CONNECTION_H #define SOLR_CONNECTION_H -#include "seq-range-array.h" -#include "fts-api.h" +#include "solr-response.h" struct solr_connection; struct fts_solr_settings; -struct solr_result { - const char *box_id; - - ARRAY_TYPE(seq_range) uids; - ARRAY_TYPE(fts_score_map) scores; -}; - int solr_connection_init(const struct fts_solr_settings *solr_set, const struct ssl_iostream_settings *ssl_client_set, struct solr_connection **conn_r, diff --git a/src/plugins/fts-solr/solr-response.h b/src/plugins/fts-solr/solr-response.h new file mode 100644 index 0000000000..1c105a56ba --- /dev/null +++ b/src/plugins/fts-solr/solr-response.h @@ -0,0 +1,14 @@ +#ifndef SOLR_RESPONSE_H +#define SOLR_RESPONSE_H + +#include "seq-range-array.h" +#include "fts-api.h" + +struct solr_result { + const char *box_id; + + ARRAY_TYPE(seq_range) uids; + ARRAY_TYPE(fts_score_map) scores; +}; + +#endif -- 2.47.3