thinking-sphinx 3.4.2 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/.travis.yml +20 -18
- data/Appraisals +28 -16
- data/CHANGELOG.markdown +538 -0
- data/Gemfile +9 -11
- data/README.textile +23 -31
- data/Rakefile +2 -0
- data/bin/console +2 -1
- data/bin/loadsphinx +29 -2
- data/lib/thinking-sphinx.rb +2 -0
- data/lib/thinking/sphinx.rb +2 -0
- data/lib/thinking_sphinx.rb +24 -13
- data/lib/thinking_sphinx/active_record.rb +10 -1
- data/lib/thinking_sphinx/active_record/association.rb +2 -0
- data/lib/thinking_sphinx/active_record/association_proxy.rb +2 -0
- data/lib/thinking_sphinx/active_record/association_proxy/attribute_finder.rb +2 -0
- data/lib/thinking_sphinx/active_record/association_proxy/attribute_matcher.rb +2 -0
- data/lib/thinking_sphinx/active_record/attribute.rb +2 -0
- data/lib/thinking_sphinx/active_record/attribute/sphinx_presenter.rb +2 -0
- data/lib/thinking_sphinx/active_record/attribute/type.rb +2 -0
- data/lib/thinking_sphinx/active_record/attribute/values.rb +2 -0
- data/lib/thinking_sphinx/active_record/base.rb +2 -0
- data/lib/thinking_sphinx/active_record/callbacks/delete_callbacks.rb +2 -0
- data/lib/thinking_sphinx/active_record/callbacks/delta_callbacks.rb +2 -0
- data/lib/thinking_sphinx/active_record/callbacks/update_callbacks.rb +2 -0
- data/lib/thinking_sphinx/active_record/column.rb +2 -0
- data/lib/thinking_sphinx/active_record/column_sql_presenter.rb +2 -0
- data/lib/thinking_sphinx/active_record/database_adapters.rb +2 -0
- data/lib/thinking_sphinx/active_record/database_adapters/abstract_adapter.rb +2 -0
- data/lib/thinking_sphinx/active_record/database_adapters/mysql_adapter.rb +2 -0
- data/lib/thinking_sphinx/active_record/database_adapters/postgresql_adapter.rb +2 -0
- data/lib/thinking_sphinx/active_record/depolymorph/association_reflection.rb +32 -0
- data/lib/thinking_sphinx/active_record/depolymorph/base_reflection.rb +32 -0
- data/lib/thinking_sphinx/active_record/depolymorph/conditions_reflection.rb +40 -0
- data/lib/thinking_sphinx/active_record/depolymorph/overridden_reflection.rb +35 -0
- data/lib/thinking_sphinx/active_record/depolymorph/scoped_reflection.rb +26 -0
- data/lib/thinking_sphinx/active_record/field.rb +2 -0
- data/lib/thinking_sphinx/active_record/filter_reflection.rb +13 -71
- data/lib/thinking_sphinx/active_record/index.rb +2 -0
- data/lib/thinking_sphinx/active_record/interpreter.rb +2 -0
- data/lib/thinking_sphinx/active_record/join_association.rb +2 -0
- data/lib/thinking_sphinx/active_record/log_subscriber.rb +2 -0
- data/lib/thinking_sphinx/active_record/polymorpher.rb +2 -0
- data/lib/thinking_sphinx/active_record/property.rb +2 -0
- data/lib/thinking_sphinx/active_record/property_query.rb +2 -0
- data/lib/thinking_sphinx/active_record/property_sql_presenter.rb +2 -0
- data/lib/thinking_sphinx/active_record/simple_many_query.rb +2 -0
- data/lib/thinking_sphinx/active_record/source_joins.rb +2 -0
- data/lib/thinking_sphinx/active_record/sql_builder.rb +2 -0
- data/lib/thinking_sphinx/active_record/sql_builder/clause_builder.rb +2 -0
- data/lib/thinking_sphinx/active_record/sql_builder/query.rb +2 -0
- data/lib/thinking_sphinx/active_record/sql_builder/statement.rb +2 -0
- data/lib/thinking_sphinx/active_record/sql_source.rb +15 -3
- data/lib/thinking_sphinx/active_record/sql_source/template.rb +2 -0
- data/lib/thinking_sphinx/attribute_types.rb +2 -0
- data/lib/thinking_sphinx/batched_search.rb +2 -0
- data/lib/thinking_sphinx/callbacks.rb +2 -0
- data/lib/thinking_sphinx/capistrano.rb +2 -0
- data/lib/thinking_sphinx/capistrano/v2.rb +2 -0
- data/lib/thinking_sphinx/capistrano/v3.rb +2 -0
- data/lib/thinking_sphinx/commander.rb +27 -0
- data/lib/thinking_sphinx/commands.rb +20 -0
- data/lib/thinking_sphinx/commands/base.rb +9 -1
- data/lib/thinking_sphinx/commands/clear_real_time.rb +22 -0
- data/lib/thinking_sphinx/commands/clear_sql.rb +18 -0
- data/lib/thinking_sphinx/commands/configure.rb +2 -0
- data/lib/thinking_sphinx/commands/index_real_time.rb +17 -0
- data/lib/thinking_sphinx/commands/index_sql.rb +25 -0
- data/lib/thinking_sphinx/commands/merge.rb +27 -0
- data/lib/thinking_sphinx/commands/merge_and_update.rb +57 -0
- data/lib/thinking_sphinx/commands/prepare.rb +13 -0
- data/lib/thinking_sphinx/commands/rotate.rb +13 -0
- data/lib/thinking_sphinx/commands/running.rb +13 -0
- data/lib/thinking_sphinx/commands/start_attached.rb +2 -0
- data/lib/thinking_sphinx/commands/start_detached.rb +3 -1
- data/lib/thinking_sphinx/commands/stop.rb +4 -2
- data/lib/thinking_sphinx/configuration.rb +28 -47
- data/lib/thinking_sphinx/configuration/consistent_ids.rb +2 -0
- data/lib/thinking_sphinx/configuration/defaults.rb +2 -0
- data/lib/thinking_sphinx/configuration/distributed_indices.rb +2 -0
- data/lib/thinking_sphinx/configuration/duplicate_names.rb +2 -0
- data/lib/thinking_sphinx/configuration/minimum_fields.rb +2 -0
- data/lib/thinking_sphinx/connection.rb +4 -5
- data/lib/thinking_sphinx/connection/client.rb +21 -0
- data/lib/thinking_sphinx/connection/jruby.rb +7 -2
- data/lib/thinking_sphinx/connection/mri.rb +2 -4
- data/lib/thinking_sphinx/core.rb +2 -0
- data/lib/thinking_sphinx/core/field.rb +2 -0
- data/lib/thinking_sphinx/core/index.rb +4 -1
- data/lib/thinking_sphinx/core/interpreter.rb +2 -0
- data/lib/thinking_sphinx/core/property.rb +2 -0
- data/lib/thinking_sphinx/core/settings.rb +2 -0
- data/lib/thinking_sphinx/deletion.rb +2 -0
- data/lib/thinking_sphinx/deltas.rb +2 -0
- data/lib/thinking_sphinx/deltas/default_delta.rb +2 -0
- data/lib/thinking_sphinx/deltas/delete_job.rb +2 -0
- data/lib/thinking_sphinx/deltas/index_job.rb +9 -1
- data/lib/thinking_sphinx/distributed.rb +2 -0
- data/lib/thinking_sphinx/distributed/index.rb +2 -0
- data/lib/thinking_sphinx/errors.rb +9 -0
- data/lib/thinking_sphinx/excerpter.rb +2 -0
- data/lib/thinking_sphinx/facet.rb +4 -3
- data/lib/thinking_sphinx/facet_search.rb +4 -2
- data/lib/thinking_sphinx/float_formatter.rb +2 -0
- data/lib/thinking_sphinx/frameworks.rb +2 -0
- data/lib/thinking_sphinx/frameworks/plain.rb +2 -0
- data/lib/thinking_sphinx/frameworks/rails.rb +2 -0
- data/lib/thinking_sphinx/guard.rb +3 -0
- data/lib/thinking_sphinx/guard/file.rb +2 -0
- data/lib/thinking_sphinx/guard/files.rb +2 -0
- data/lib/thinking_sphinx/guard/none.rb +7 -0
- data/lib/thinking_sphinx/hooks/guard_presence.rb +34 -0
- data/lib/thinking_sphinx/index.rb +2 -0
- data/lib/thinking_sphinx/index_set.rb +2 -0
- data/lib/thinking_sphinx/indexing_strategies/all_at_once.rb +2 -0
- data/lib/thinking_sphinx/indexing_strategies/one_at_a_time.rb +2 -0
- data/lib/thinking_sphinx/interfaces.rb +10 -0
- data/lib/thinking_sphinx/interfaces/base.rb +13 -0
- data/lib/thinking_sphinx/interfaces/daemon.rb +6 -11
- data/lib/thinking_sphinx/interfaces/real_time.rb +19 -14
- data/lib/thinking_sphinx/interfaces/sql.rb +22 -10
- data/lib/thinking_sphinx/logger.rb +2 -0
- data/lib/thinking_sphinx/masks.rb +2 -0
- data/lib/thinking_sphinx/masks/group_enumerators_mask.rb +6 -4
- data/lib/thinking_sphinx/masks/pagination_mask.rb +2 -0
- data/lib/thinking_sphinx/masks/scopes_mask.rb +2 -0
- data/lib/thinking_sphinx/masks/weight_enumerator_mask.rb +3 -1
- data/lib/thinking_sphinx/middlewares.rb +5 -3
- data/lib/thinking_sphinx/middlewares/active_record_translator.rb +2 -0
- data/lib/thinking_sphinx/middlewares/geographer.rb +2 -0
- data/lib/thinking_sphinx/middlewares/glazier.rb +2 -0
- data/lib/thinking_sphinx/middlewares/ids_only.rb +2 -0
- data/lib/thinking_sphinx/middlewares/inquirer.rb +2 -0
- data/lib/thinking_sphinx/middlewares/middleware.rb +2 -0
- data/lib/thinking_sphinx/middlewares/sphinxql.rb +4 -2
- data/lib/thinking_sphinx/middlewares/stale_id_checker.rb +2 -0
- data/lib/thinking_sphinx/middlewares/stale_id_filter.rb +2 -0
- data/lib/thinking_sphinx/middlewares/valid_options.rb +2 -0
- data/lib/thinking_sphinx/panes.rb +2 -0
- data/lib/thinking_sphinx/panes/attributes_pane.rb +2 -0
- data/lib/thinking_sphinx/panes/distance_pane.rb +2 -0
- data/lib/thinking_sphinx/panes/excerpts_pane.rb +2 -0
- data/lib/thinking_sphinx/panes/weight_pane.rb +3 -1
- data/lib/thinking_sphinx/query.rb +2 -0
- data/lib/thinking_sphinx/railtie.rb +2 -0
- data/lib/thinking_sphinx/rake_interface.rb +3 -1
- data/lib/thinking_sphinx/real_time.rb +3 -0
- data/lib/thinking_sphinx/real_time/attribute.rb +2 -0
- data/lib/thinking_sphinx/real_time/callbacks/real_time_callbacks.rb +2 -0
- data/lib/thinking_sphinx/real_time/field.rb +2 -0
- data/lib/thinking_sphinx/real_time/index.rb +2 -0
- data/lib/thinking_sphinx/real_time/index/template.rb +2 -0
- data/lib/thinking_sphinx/real_time/interpreter.rb +2 -0
- data/lib/thinking_sphinx/real_time/populator.rb +2 -1
- data/lib/thinking_sphinx/real_time/property.rb +2 -0
- data/lib/thinking_sphinx/real_time/transcribe_instance.rb +38 -0
- data/lib/thinking_sphinx/real_time/transcriber.rb +18 -27
- data/lib/thinking_sphinx/real_time/translator.rb +3 -1
- data/lib/thinking_sphinx/scopes.rb +2 -0
- data/lib/thinking_sphinx/search.rb +2 -0
- data/lib/thinking_sphinx/search/batch_inquirer.rb +2 -0
- data/lib/thinking_sphinx/search/context.rb +2 -0
- data/lib/thinking_sphinx/search/glaze.rb +2 -0
- data/lib/thinking_sphinx/search/merger.rb +2 -0
- data/lib/thinking_sphinx/search/query.rb +2 -0
- data/lib/thinking_sphinx/search/stale_ids_exception.rb +2 -0
- data/lib/thinking_sphinx/settings.rb +110 -0
- data/lib/thinking_sphinx/sinatra.rb +2 -0
- data/lib/thinking_sphinx/subscribers/populator_subscriber.rb +18 -0
- data/lib/thinking_sphinx/tasks.rb +13 -46
- data/lib/thinking_sphinx/test.rb +2 -0
- data/lib/thinking_sphinx/utf8.rb +2 -0
- data/lib/thinking_sphinx/wildcard.rb +2 -0
- data/lib/thinking_sphinx/with_output.rb +2 -0
- data/spec/acceptance/association_scoping_spec.rb +2 -0
- data/spec/acceptance/attribute_access_spec.rb +4 -4
- data/spec/acceptance/attribute_updates_spec.rb +2 -0
- data/spec/acceptance/batch_searching_spec.rb +2 -0
- data/spec/acceptance/big_integers_spec.rb +2 -0
- data/spec/acceptance/connection_spec.rb +2 -0
- data/spec/acceptance/excerpts_spec.rb +1 -0
- data/spec/acceptance/facets_spec.rb +2 -3
- data/spec/acceptance/geosearching_spec.rb +3 -1
- data/spec/acceptance/grouping_by_attributes_spec.rb +2 -0
- data/spec/acceptance/index_options_spec.rb +2 -0
- data/spec/acceptance/indexing_spec.rb +2 -0
- data/spec/acceptance/merging_spec.rb +90 -0
- data/spec/acceptance/paginating_search_results_spec.rb +2 -0
- data/spec/acceptance/real_time_updates_spec.rb +2 -0
- data/spec/acceptance/remove_deleted_records_spec.rb +2 -0
- data/spec/acceptance/search_counts_spec.rb +2 -0
- data/spec/acceptance/search_for_just_ids_spec.rb +2 -0
- data/spec/acceptance/searching_across_models_spec.rb +2 -0
- data/spec/acceptance/searching_across_schemas_spec.rb +2 -0
- data/spec/acceptance/searching_on_fields_spec.rb +2 -0
- data/spec/acceptance/searching_with_filters_spec.rb +2 -0
- data/spec/acceptance/searching_with_sti_spec.rb +2 -0
- data/spec/acceptance/searching_within_a_model_spec.rb +2 -0
- data/spec/acceptance/sorting_search_results_spec.rb +2 -0
- data/spec/acceptance/spec_helper.rb +2 -13
- data/spec/acceptance/specifying_sql_spec.rb +2 -0
- data/spec/acceptance/sphinx_scopes_spec.rb +2 -0
- data/spec/acceptance/sql_deltas_spec.rb +2 -0
- data/spec/acceptance/support/database_cleaner.rb +2 -0
- data/spec/acceptance/support/sphinx_controller.rb +16 -5
- data/spec/acceptance/support/sphinx_helpers.rb +11 -0
- data/spec/acceptance/suspended_deltas_spec.rb +2 -0
- data/spec/internal/app/indices/admin_person_index.rb +2 -0
- data/spec/internal/app/indices/album_index.rb +2 -0
- data/spec/internal/app/indices/animal_index.rb +2 -0
- data/spec/internal/app/indices/article_index.rb +2 -0
- data/spec/internal/app/indices/bird_index.rb +2 -0
- data/spec/internal/app/indices/book_index.rb +2 -0
- data/spec/internal/app/indices/car_index.rb +2 -0
- data/spec/internal/app/indices/city_index.rb +2 -0
- data/spec/internal/app/indices/product_index.rb +2 -0
- data/spec/internal/app/indices/tee_index.rb +2 -0
- data/spec/internal/app/indices/user_index.rb +2 -0
- data/spec/internal/app/models/admin/person.rb +2 -0
- data/spec/internal/app/models/album.rb +2 -0
- data/spec/internal/app/models/animal.rb +2 -0
- data/spec/internal/app/models/article.rb +2 -0
- data/spec/internal/app/models/bird.rb +2 -0
- data/spec/internal/app/models/book.rb +2 -0
- data/spec/internal/app/models/car.rb +2 -0
- data/spec/internal/app/models/categorisation.rb +2 -0
- data/spec/internal/app/models/category.rb +2 -0
- data/spec/internal/app/models/city.rb +2 -0
- data/spec/internal/app/models/colour.rb +2 -0
- data/spec/internal/app/models/event.rb +2 -0
- data/spec/internal/app/models/flightless_bird.rb +2 -0
- data/spec/internal/app/models/genre.rb +2 -0
- data/spec/internal/app/models/hardcover.rb +2 -0
- data/spec/internal/app/models/mammal.rb +2 -0
- data/spec/internal/app/models/manufacturer.rb +2 -0
- data/spec/internal/app/models/product.rb +2 -0
- data/spec/internal/app/models/tag.rb +2 -0
- data/spec/internal/app/models/tagging.rb +2 -0
- data/spec/internal/app/models/tee.rb +2 -0
- data/spec/internal/app/models/tweet.rb +2 -0
- data/spec/internal/app/models/user.rb +2 -0
- data/spec/internal/db/schema.rb +2 -0
- data/spec/spec_helper.rb +4 -1
- data/spec/support/json_column.rb +3 -5
- data/spec/support/multi_schema.rb +2 -0
- data/spec/support/mysql.rb +25 -0
- data/spec/support/sphinx_yaml_helpers.rb +2 -0
- data/spec/thinking_sphinx/active_record/association_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/attribute/type_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/base_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/callbacks/delete_callbacks_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/callbacks/delta_callbacks_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/callbacks/update_callbacks_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/column_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/column_sql_presenter_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/database_adapters/abstract_adapter_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/database_adapters/mysql_adapter_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/database_adapters/postgresql_adapter_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/database_adapters_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/field_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/filter_reflection_spec.rb +100 -79
- data/spec/thinking_sphinx/active_record/index_spec.rb +16 -1
- data/spec/thinking_sphinx/active_record/interpreter_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/polymorpher_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/property_sql_presenter_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/sql_builder_spec.rb +2 -0
- data/spec/thinking_sphinx/active_record/sql_source_spec.rb +2 -0
- data/spec/thinking_sphinx/attribute_types_spec.rb +2 -0
- data/spec/thinking_sphinx/commands/clear_real_time_spec.rb +46 -0
- data/spec/thinking_sphinx/commands/clear_sql_spec.rb +52 -0
- data/spec/thinking_sphinx/commands/configure_spec.rb +2 -0
- data/spec/thinking_sphinx/commands/index_real_time_spec.rb +33 -0
- data/spec/thinking_sphinx/commands/index_sql_spec.rb +86 -0
- data/spec/thinking_sphinx/commands/merge_and_update_spec.rb +106 -0
- data/spec/thinking_sphinx/commands/merge_spec.rb +48 -0
- data/spec/thinking_sphinx/commands/prepare_spec.rb +23 -0
- data/spec/thinking_sphinx/commands/start_detached_spec.rb +2 -0
- data/spec/thinking_sphinx/commands/stop_spec.rb +13 -4
- data/spec/thinking_sphinx/configuration/minimum_fields_spec.rb +2 -0
- data/spec/thinking_sphinx/configuration_spec.rb +132 -6
- data/spec/thinking_sphinx/connection_spec.rb +2 -0
- data/spec/thinking_sphinx/deletion_spec.rb +2 -0
- data/spec/thinking_sphinx/deltas/default_delta_spec.rb +8 -1
- data/spec/thinking_sphinx/deltas_spec.rb +2 -0
- data/spec/thinking_sphinx/errors_spec.rb +2 -0
- data/spec/thinking_sphinx/excerpter_spec.rb +2 -0
- data/spec/thinking_sphinx/facet_search_spec.rb +8 -6
- data/spec/thinking_sphinx/hooks/guard_presence_spec.rb +30 -0
- data/spec/thinking_sphinx/index_set_spec.rb +2 -0
- data/spec/thinking_sphinx/index_spec.rb +2 -0
- data/spec/thinking_sphinx/interfaces/daemon_spec.rb +19 -11
- data/spec/thinking_sphinx/interfaces/real_time_spec.rb +43 -43
- data/spec/thinking_sphinx/interfaces/sql_spec.rb +76 -52
- data/spec/thinking_sphinx/masks/pagination_mask_spec.rb +2 -0
- data/spec/thinking_sphinx/masks/scopes_mask_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/active_record_translator_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/geographer_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/glazier_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/inquirer_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/sphinxql_spec.rb +2 -1
- data/spec/thinking_sphinx/middlewares/stale_id_checker_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/stale_id_filter_spec.rb +2 -0
- data/spec/thinking_sphinx/middlewares/valid_options_spec.rb +2 -0
- data/spec/thinking_sphinx/panes/attributes_pane_spec.rb +2 -0
- data/spec/thinking_sphinx/panes/distance_pane_spec.rb +2 -0
- data/spec/thinking_sphinx/panes/excerpts_pane_spec.rb +2 -0
- data/spec/thinking_sphinx/panes/weight_pane_spec.rb +3 -1
- data/spec/thinking_sphinx/rake_interface_spec.rb +10 -8
- data/spec/thinking_sphinx/real_time/attribute_spec.rb +2 -0
- data/spec/thinking_sphinx/real_time/callbacks/real_time_callbacks_spec.rb +2 -0
- data/spec/thinking_sphinx/real_time/field_spec.rb +2 -0
- data/spec/thinking_sphinx/real_time/index_spec.rb +14 -0
- data/spec/thinking_sphinx/real_time/interpreter_spec.rb +2 -0
- data/spec/thinking_sphinx/real_time/transcribe_instance_spec.rb +35 -0
- data/spec/thinking_sphinx/real_time/transcriber_spec.rb +101 -0
- data/spec/thinking_sphinx/real_time/translator_spec.rb +17 -0
- data/spec/thinking_sphinx/scopes_spec.rb +2 -0
- data/spec/thinking_sphinx/search/glaze_spec.rb +2 -0
- data/spec/thinking_sphinx/search/query_spec.rb +2 -0
- data/spec/thinking_sphinx/search_spec.rb +2 -0
- data/spec/thinking_sphinx/wildcard_spec.rb +2 -0
- data/spec/thinking_sphinx_spec.rb +2 -0
- data/thinking-sphinx.gemspec +7 -5
- metadata +62 -25
- data/HISTORY +0 -326
- data/bin/literals +0 -9
- data/lib/thinking_sphinx/commands/index.rb +0 -11
- data/lib/thinking_sphinx/controller.rb +0 -12
- data/lib/thinking_sphinx/middlewares/attribute_typer.rb +0 -48
- data/lib/thinking_sphinx/middlewares/utf8.rb +0 -27
- data/lib/thinking_sphinx/sphinxql.rb +0 -23
- data/spec/thinking_sphinx/commands/index_spec.rb +0 -26
- data/spec/thinking_sphinx/middlewares/attribute_typer_spec.rb +0 -42
@@ -1,16 +1,15 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ThinkingSphinx::Connection
|
2
4
|
MAXIMUM_RETRIES = 3
|
3
5
|
|
4
6
|
def self.new
|
5
7
|
configuration = ThinkingSphinx::Configuration.instance
|
6
|
-
# If you use localhost, MySQL insists on a socket connection, but Sphinx
|
7
|
-
# requires a TCP connection. Using 127.0.0.1 fixes that.
|
8
|
-
address = configuration.searchd.address || '127.0.0.1'
|
9
|
-
address = '127.0.0.1' if address == 'localhost'
|
10
8
|
|
11
9
|
options = {
|
12
|
-
:host => address,
|
10
|
+
:host => configuration.searchd.address,
|
13
11
|
:port => configuration.searchd.mysql41,
|
12
|
+
:socket => configuration.searchd.socket,
|
14
13
|
:reconnect => true
|
15
14
|
}.merge(configuration.settings['connection_options'] || {})
|
16
15
|
|
@@ -1,4 +1,25 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ThinkingSphinx::Connection::Client
|
4
|
+
def initialize(options)
|
5
|
+
if options[:socket].present?
|
6
|
+
options[:socket] = options[:socket].remove /:mysql41$/
|
7
|
+
|
8
|
+
options.delete :host
|
9
|
+
options.delete :port
|
10
|
+
else
|
11
|
+
options.delete :socket
|
12
|
+
|
13
|
+
# If you use localhost, MySQL insists on a socket connection, but in this
|
14
|
+
# situation we want a TCP connection. Using 127.0.0.1 fixes that.
|
15
|
+
if options[:host].nil? || options[:host] == "localhost"
|
16
|
+
options[:host] = "127.0.0.1"
|
17
|
+
end
|
18
|
+
end
|
19
|
+
|
20
|
+
@options = options
|
21
|
+
end
|
22
|
+
|
2
23
|
def close
|
3
24
|
close! unless ThinkingSphinx::Connection.persistent?
|
4
25
|
end
|
@@ -1,9 +1,14 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ThinkingSphinx::Connection::JRuby < ThinkingSphinx::Connection::Client
|
2
4
|
attr_reader :address, :options
|
3
5
|
|
4
6
|
def initialize(options)
|
5
|
-
|
6
|
-
|
7
|
+
options.delete :socket
|
8
|
+
|
9
|
+
super
|
10
|
+
|
11
|
+
@address = "jdbc:mysql://#{@options[:host]}:#{@options[:port]}/?allowMultiQueries=true"
|
7
12
|
end
|
8
13
|
|
9
14
|
def base_error
|
@@ -1,8 +1,6 @@
|
|
1
|
-
|
2
|
-
def initialize(options)
|
3
|
-
@options = options
|
4
|
-
end
|
1
|
+
# frozen_string_literal: true
|
5
2
|
|
3
|
+
class ThinkingSphinx::Connection::MRI < ThinkingSphinx::Connection::Client
|
6
4
|
def base_error
|
7
5
|
Mysql2::Error
|
8
6
|
end
|
data/lib/thinking_sphinx/core.rb
CHANGED
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
module ThinkingSphinx::Core::Index
|
2
4
|
extend ActiveSupport::Concern
|
3
5
|
include ThinkingSphinx::Core::Settings
|
@@ -9,7 +11,7 @@ module ThinkingSphinx::Core::Index
|
|
9
11
|
|
10
12
|
def initialize(reference, options = {})
|
11
13
|
@reference = reference.to_sym
|
12
|
-
@docinfo = :extern
|
14
|
+
@docinfo = :extern unless config.settings["skip_docinfo"]
|
13
15
|
@options = options
|
14
16
|
@offset = config.next_offset(options[:offset_as] || reference)
|
15
17
|
@type = 'plain'
|
@@ -36,6 +38,7 @@ module ThinkingSphinx::Core::Index
|
|
36
38
|
end
|
37
39
|
|
38
40
|
def interpret_definition!
|
41
|
+
return unless model.table_exists?
|
39
42
|
return if @interpreted_definition
|
40
43
|
|
41
44
|
apply_defaults!
|
@@ -1,14 +1,22 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ThinkingSphinx::Deltas::IndexJob
|
2
4
|
def initialize(index_name)
|
3
5
|
@index_name = index_name
|
4
6
|
end
|
5
7
|
|
6
8
|
def perform
|
7
|
-
|
9
|
+
ThinkingSphinx::Commander.call(
|
10
|
+
:index_sql, configuration,
|
11
|
+
:indices => [index_name],
|
12
|
+
:verbose => !quiet_deltas?
|
13
|
+
)
|
8
14
|
end
|
9
15
|
|
10
16
|
private
|
11
17
|
|
18
|
+
attr_reader :index_name
|
19
|
+
|
12
20
|
def configuration
|
13
21
|
@configuration ||= ThinkingSphinx::Configuration.instance
|
14
22
|
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ThinkingSphinx::SphinxError < StandardError
|
2
4
|
attr_accessor :statement
|
3
5
|
|
@@ -85,3 +87,10 @@ end
|
|
85
87
|
|
86
88
|
class ThinkingSphinx::UnknownAttributeType < StandardError
|
87
89
|
end
|
90
|
+
|
91
|
+
class ThinkingSphinx::TranscriptionError < StandardError
|
92
|
+
attr_accessor :inner_exception, :instance, :property
|
93
|
+
end
|
94
|
+
|
95
|
+
class ThinkingSphinx::UnknownCommand < StandardError
|
96
|
+
end
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ThinkingSphinx::Facet
|
2
4
|
attr_reader :name
|
3
5
|
|
@@ -11,7 +13,7 @@ class ThinkingSphinx::Facet
|
|
11
13
|
|
12
14
|
def results_from(raw)
|
13
15
|
raw.inject({}) { |hash, row|
|
14
|
-
hash[row[group_column]] = row[
|
16
|
+
hash[row[group_column]] = row["sphinx_internal_count"]
|
15
17
|
hash
|
16
18
|
}
|
17
19
|
end
|
@@ -19,8 +21,7 @@ class ThinkingSphinx::Facet
|
|
19
21
|
private
|
20
22
|
|
21
23
|
def group_column
|
22
|
-
@properties.any?(&:multi?) ?
|
23
|
-
ThinkingSphinx::SphinxQL.group_by[:column] : name
|
24
|
+
@properties.any?(&:multi?) ? "sphinx_internal_group" : name
|
24
25
|
end
|
25
26
|
|
26
27
|
def use_field?
|
@@ -1,3 +1,5 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
1
3
|
class ThinkingSphinx::FacetSearch
|
2
4
|
include Enumerable
|
3
5
|
|
@@ -112,8 +114,8 @@ class ThinkingSphinx::FacetSearch
|
|
112
114
|
def options_for(facet)
|
113
115
|
options.merge(
|
114
116
|
:select => [(options[:select] || '*'),
|
115
|
-
"
|
116
|
-
"
|
117
|
+
"groupby() AS sphinx_internal_group",
|
118
|
+
"id AS sphinx_document_id, count(DISTINCT sphinx_document_id) AS sphinx_internal_count"
|
117
119
|
].join(', '),
|
118
120
|
:group_by => facet.name,
|
119
121
|
:indices => index_names_for(facet),
|
@@ -0,0 +1,34 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class ThinkingSphinx::Hooks::GuardPresence
|
4
|
+
def self.call(configuration = nil, stream = STDERR)
|
5
|
+
new(configuration, stream).call
|
6
|
+
end
|
7
|
+
|
8
|
+
def initialize(configuration = nil, stream = STDERR)
|
9
|
+
@configuration = configuration || ThinkingSphinx::Configuration.instance
|
10
|
+
@stream = stream
|
11
|
+
end
|
12
|
+
|
13
|
+
def call
|
14
|
+
return if files.empty?
|
15
|
+
|
16
|
+
stream.puts "WARNING: The following indexing guard files exist:"
|
17
|
+
files.each do |file|
|
18
|
+
stream.puts " * #{file}"
|
19
|
+
end
|
20
|
+
stream.puts <<-TXT
|
21
|
+
These files indicate indexing is already happening. If that is not the case,
|
22
|
+
these files should be deleted to ensure all indices can be processed.
|
23
|
+
|
24
|
+
TXT
|
25
|
+
end
|
26
|
+
|
27
|
+
private
|
28
|
+
|
29
|
+
attr_reader :configuration, :stream
|
30
|
+
|
31
|
+
def files
|
32
|
+
@files ||= Dir["#{configuration.indices_location}/ts-*.tmp"]
|
33
|
+
end
|
34
|
+
end
|
@@ -0,0 +1,10 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
module ThinkingSphinx::Interfaces
|
4
|
+
#
|
5
|
+
end
|
6
|
+
|
7
|
+
require 'thinking_sphinx/interfaces/base'
|
8
|
+
require 'thinking_sphinx/interfaces/daemon'
|
9
|
+
require 'thinking_sphinx/interfaces/real_time'
|
10
|
+
require 'thinking_sphinx/interfaces/sql'
|
@@ -0,0 +1,13 @@
|
|
1
|
+
# frozen_string_literal: true
|
2
|
+
|
3
|
+
class ThinkingSphinx::Interfaces::Base
|
4
|
+
include ThinkingSphinx::WithOutput
|
5
|
+
|
6
|
+
private
|
7
|
+
|
8
|
+
def command(command, extra_options = {})
|
9
|
+
ThinkingSphinx::Commander.call(
|
10
|
+
command, configuration, options.merge(extra_options), stream
|
11
|
+
)
|
12
|
+
end
|
13
|
+
end
|