diff --git a/.github/workflows/ui-ci.yml b/.github/workflows/ui-ci.yml index d8e1c8d8cca..3e8290620f6 100644 --- a/.github/workflows/ui-ci.yml +++ b/.github/workflows/ui-ci.yml @@ -26,7 +26,8 @@ jobs: CI=false yarn --cwd quickwit-ui build cargo build --features=postgres mkdir qwdata - cargo run --features=postgres -- run --service searcher --service metastore --config ../config/quickwit.yaml & + # Workaround for possible rust regression - https://github.com/quickwit-oss/quickwit/issues/3346 + target/debug/quickwit run --service searcher --service metastore --config ../config/quickwit.yaml & yarn --cwd quickwit-ui cypress run - name: Lint command: yarn --cwd quickwit-ui lint diff --git a/config/quickwit.yaml b/config/quickwit.yaml index 205c80e3f3f..1989e74b128 100644 --- a/config/quickwit.yaml +++ b/config/quickwit.yaml @@ -9,7 +9,7 @@ # # Config file format version. # -version: 0.5 +version: 0.6 # # Node ID. Must be unique within a cluster. If not set, a random node ID is generated on each startup. # diff --git a/config/tutorials/gh-archive/index-config-for-clickhouse.yaml b/config/tutorials/gh-archive/index-config-for-clickhouse.yaml index 7ef55e25ce6..6f549a51414 100644 --- a/config/tutorials/gh-archive/index-config-for-clickhouse.yaml +++ b/config/tutorials/gh-archive/index-config-for-clickhouse.yaml @@ -1,7 +1,7 @@ # # Index config file for gh-archive dataset. # -version: 0.5 +version: 0.6 index_id: gh-archive diff --git a/config/tutorials/gh-archive/index-config.yaml b/config/tutorials/gh-archive/index-config.yaml index 3c4090f7bc9..cfd2864db6d 100644 --- a/config/tutorials/gh-archive/index-config.yaml +++ b/config/tutorials/gh-archive/index-config.yaml @@ -1,7 +1,7 @@ # # Index config file for gh-archive dataset. # -version: 0.5 +version: 0.6 index_id: gh-archive diff --git a/config/tutorials/gh-archive/kafka-source.yaml b/config/tutorials/gh-archive/kafka-source.yaml index a6de5078851..f5a61c50996 100644 --- a/config/tutorials/gh-archive/kafka-source.yaml +++ b/config/tutorials/gh-archive/kafka-source.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 source_id: kafka-source source_type: kafka params: diff --git a/config/tutorials/gh-archive/kinesis-source.yaml b/config/tutorials/gh-archive/kinesis-source.yaml index 2d8596af8a3..96c097950ed 100644 --- a/config/tutorials/gh-archive/kinesis-source.yaml +++ b/config/tutorials/gh-archive/kinesis-source.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 source_id: kinesis-source source_type: kinesis params: diff --git a/config/tutorials/hdfs-logs/index-config-partitioned.yaml b/config/tutorials/hdfs-logs/index-config-partitioned.yaml index 358ac36ad11..9c6eb9278d8 100644 --- a/config/tutorials/hdfs-logs/index-config-partitioned.yaml +++ b/config/tutorials/hdfs-logs/index-config-partitioned.yaml @@ -2,7 +2,7 @@ # Index config file for hdfs-logs dataset with partitioning configured. # -version: 0.5 +version: 0.6 index_id: hdfs-logs-partitioned diff --git a/config/tutorials/hdfs-logs/index-config-retention-policy.yaml b/config/tutorials/hdfs-logs/index-config-retention-policy.yaml index ac2196d26e9..24407e2ff3e 100644 --- a/config/tutorials/hdfs-logs/index-config-retention-policy.yaml +++ b/config/tutorials/hdfs-logs/index-config-retention-policy.yaml @@ -2,7 +2,7 @@ # Index config file for hdfs-logs dataset with a retention policy configured. # -version: 0.5 +version: 0.6 index_id: hdfs-logs-retention-policy diff --git a/config/tutorials/hdfs-logs/index-config.yaml b/config/tutorials/hdfs-logs/index-config.yaml index 03987678499..e7a9727b35e 100644 --- a/config/tutorials/hdfs-logs/index-config.yaml +++ b/config/tutorials/hdfs-logs/index-config.yaml @@ -2,7 +2,7 @@ # Index config file for hdfs-logs dataset. # -version: 0.5 +version: 0.6 index_id: hdfs-logs diff --git a/config/tutorials/hdfs-logs/searcher-1.yaml b/config/tutorials/hdfs-logs/searcher-1.yaml index 3fd5464ba8d..140102c5f8e 100644 --- a/config/tutorials/hdfs-logs/searcher-1.yaml +++ b/config/tutorials/hdfs-logs/searcher-1.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 node_id: searcher-1 listen_address: 127.0.0.1 rest_listen_port: 7280 diff --git a/config/tutorials/hdfs-logs/searcher-2.yaml b/config/tutorials/hdfs-logs/searcher-2.yaml index a2918b51565..110475d732b 100644 --- a/config/tutorials/hdfs-logs/searcher-2.yaml +++ b/config/tutorials/hdfs-logs/searcher-2.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 node_id: searcher-2 listen_address: 127.0.0.1 rest_listen_port: 7290 diff --git a/config/tutorials/hdfs-logs/searcher-3.yaml b/config/tutorials/hdfs-logs/searcher-3.yaml index 808e0571e4b..ba287724e03 100644 --- a/config/tutorials/hdfs-logs/searcher-3.yaml +++ b/config/tutorials/hdfs-logs/searcher-3.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 node_id: searcher-3 listen_address: 127.0.0.1 rest_listen_port: 7300 diff --git a/config/tutorials/otel-logs/index-config.yaml b/config/tutorials/otel-logs/index-config.yaml index c62a1288821..f0f5779d0d5 100644 --- a/config/tutorials/otel-logs/index-config.yaml +++ b/config/tutorials/otel-logs/index-config.yaml @@ -3,7 +3,7 @@ # Link: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md # -version: 0.5 +version: 0.6 index_id: otel-log-v0 diff --git a/config/tutorials/otel-trace/index-config.yaml b/config/tutorials/otel-trace/index-config.yaml index dfd9fbdbfe2..67602843f0d 100644 --- a/config/tutorials/otel-trace/index-config.yaml +++ b/config/tutorials/otel-trace/index-config.yaml @@ -3,7 +3,7 @@ # Link: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md # -version: 0.5 +version: 0.6 index_id: otel-trace-v0 diff --git a/config/tutorials/stackoverflow/index-config.yaml b/config/tutorials/stackoverflow/index-config.yaml index 6a8d4b0df05..3047bf0adcf 100644 --- a/config/tutorials/stackoverflow/index-config.yaml +++ b/config/tutorials/stackoverflow/index-config.yaml @@ -1,7 +1,7 @@ # # Index config file for stackoverflow dataset. # -version: 0.5 +version: 0.6 index_id: stackoverflow diff --git a/config/tutorials/stackoverflow/pulsar-source.yaml b/config/tutorials/stackoverflow/pulsar-source.yaml index 531436399ab..1f0d02781da 100644 --- a/config/tutorials/stackoverflow/pulsar-source.yaml +++ b/config/tutorials/stackoverflow/pulsar-source.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 source_id: pulsar-source source_type: pulsar params: diff --git a/config/tutorials/vector-otel-logs/index-config.yaml b/config/tutorials/vector-otel-logs/index-config.yaml index 6430358e164..1455d177c72 100644 --- a/config/tutorials/vector-otel-logs/index-config.yaml +++ b/config/tutorials/vector-otel-logs/index-config.yaml @@ -3,7 +3,7 @@ # Link: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md # -version: 0.5 +version: 0.6 index_id: vector-otel-logs diff --git a/config/tutorials/wikipedia/index-config.yaml b/config/tutorials/wikipedia/index-config.yaml index edeac647576..abd731e8902 100644 --- a/config/tutorials/wikipedia/index-config.yaml +++ b/config/tutorials/wikipedia/index-config.yaml @@ -2,7 +2,7 @@ # Index config file for wikipedia dataset. # -version: 0.5 +version: 0.6 index_id: wikipedia diff --git a/docs/configuration/index-config.md b/docs/configuration/index-config.md index 4a29a047a1e..5c7a47568c5 100644 --- a/docs/configuration/index-config.md +++ b/docs/configuration/index-config.md @@ -20,7 +20,7 @@ The index configuration format is YAML. When a key is absent from the configurat Here is a complete example suited for the HDFS logs dataset: ```yaml -version: 0.5 # File format version. +version: 0.6 # File format version. index_id: "hdfs" @@ -387,7 +387,7 @@ The configuration of `dynamic` mode can be set via the `dynamic_mapping` paramet `dynamic_mapping` offers the same configuration options as when configuring a `json` field. It defaults to: ```yaml -version: 0.5 +version: 0.6 index_id: my-dynamic-index doc_mapping: mode: dynamic @@ -407,7 +407,7 @@ the root of the JSON object. For instance, in a entirely schemaless settings, a minimal index configuration could be: ```yaml -version: 0.5 +version: 0.6 index_id: my-dynamic-index # note we did not map anything. doc_mapping: @@ -492,7 +492,7 @@ Quickwit's default merge policy is the `stable_log` merge policy with the following parameters: ```yaml -version: 0.5 +version: 0.6 index_id: "hdfs" # ... indexing_settings: @@ -520,7 +520,7 @@ of the number of merge operation a split should undergo. ```yaml -version: 0.5 +version: 0.6 index_id: "hdfs" # ... indexing_settings: @@ -548,7 +548,7 @@ This setting is not recommended. Merges are necessary to reduce the number of sp ::: ```yaml -version: 0.5 +version: 0.6 index_id: "hdfs" indexing_settings: merge_policy: @@ -575,7 +575,7 @@ This section describes search settings for a given index. This section describes how Quickwit manages data retention. In Quickwit, the retention policy manager drops data on a split basis as opposed to individually dropping documents. Splits are evaluated based on their `time_range` which is derived from the index timestamp field specified in the (`indexing_settings.timestamp_field`) settings. Using this setting, the retention policy will delete a split when `now() - split.time_range.end >= retention_policy.period` ```yaml -version: 0.5 +version: 0.6 index_id: hdfs # ... retention: diff --git a/docs/configuration/node-config.md b/docs/configuration/node-config.md index 64d953ee547..7e26315cbb5 100644 --- a/docs/configuration/node-config.md +++ b/docs/configuration/node-config.md @@ -110,7 +110,7 @@ export QW_LISTEN_ADDRESS=0.0.0.0 ```yaml # config.yaml -version: 0.5 +version: 0.6 cluster_id: quickwit-cluster node_id: my-unique-node-id listen_address: ${QW_LISTEN_ADDRESS} @@ -120,7 +120,7 @@ rest_listen_port: ${QW_LISTEN_PORT:-1111} Will be interpreted by Quickwit as: ```yaml -version: 0.5 +version: 0.6 cluster_id: quickwit-cluster node_id: my-unique-node-id listen_address: 0.0.0.0 @@ -135,7 +135,7 @@ by default no origins are allowed. A wildcard, single origin or multiple origins can be specified as part of the `rest_cors_allow_origins` parameter: ```yaml -version: 0.5 +version: 0.6 index_id: hdfs rest_cors_allow_origins: '*' # Allow all origins diff --git a/docs/configuration/source-config.md b/docs/configuration/source-config.md index c1c5207a782..6d46adc2049 100644 --- a/docs/configuration/source-config.md +++ b/docs/configuration/source-config.md @@ -77,7 +77,7 @@ Short max poll interval durations may cause a source to crash when back pressure ```bash cat << EOF > source-config.yaml -version: 0.5 +version: 0.6 source_id: my-kafka-source source_type: kafka params: @@ -119,7 +119,7 @@ If no region is specified, Quickwit will attempt to find one in multiple other l ```bash cat << EOF > source-config.yaml -version: 0.5 +version: 0.6 source_id: my-kinesis-source source_type: kinesis params: @@ -148,7 +148,7 @@ The Pulsar source consumes `topics` using the client library [pulsar-rs](https:/ ```bash cat << EOF > source-config.yaml -version: 0.5 +version: 0.6 source_id: my-pulsar-source source_type: pulsar params: diff --git a/docs/distributed-tracing/otel-service.md b/docs/distributed-tracing/otel-service.md index b5e2fe0ffc3..e874075a285 100644 --- a/docs/distributed-tracing/otel-service.md +++ b/docs/distributed-tracing/otel-service.md @@ -27,7 +27,7 @@ Below is the doc mapping of the `otel-trace-v0` index: ```yaml -version: 0.5 +version: 0.6 index_id: otel-trace-v0 diff --git a/docs/get-started/quickstart.md b/docs/get-started/quickstart.md index 208dbe5d49f..136e9c14a1c 100644 --- a/docs/get-started/quickstart.md +++ b/docs/get-started/quickstart.md @@ -87,7 +87,7 @@ And here is the complete config: # # Index config file for stackoverflow dataset. # -version: 0.5 +version: 0.6 index_id: stackoverflow diff --git a/docs/get-started/tutorials/add-full-text-search-to-your-olap-db.md b/docs/get-started/tutorials/add-full-text-search-to-your-olap-db.md index 322c80a2da7..62588081631 100644 --- a/docs/get-started/tutorials/add-full-text-search-to-your-olap-db.md +++ b/docs/get-started/tutorials/add-full-text-search-to-your-olap-db.md @@ -51,7 +51,7 @@ We don't need to index all fields described above as `title` and `body` are the The `id` will be helpful for making the JOINs in ClickHouse, `created_at` and `event_type` may also be beneficial for timestamp pruning and filtering. ```yaml title="gh-archive-index-config.yaml" -version: 0.5 +version: 0.6 index_id: gh-archive # By default, the index will be stored in your data directory, # but you can store it on s3 or on a custom path as follows: diff --git a/docs/get-started/tutorials/tutorial-hdfs-logs-distributed-search-aws-s3.md b/docs/get-started/tutorials/tutorial-hdfs-logs-distributed-search-aws-s3.md index 5377497f6e7..d5e8fe61520 100644 --- a/docs/get-started/tutorials/tutorial-hdfs-logs-distributed-search-aws-s3.md +++ b/docs/get-started/tutorials/tutorial-hdfs-logs-distributed-search-aws-s3.md @@ -57,7 +57,7 @@ Now we can create a Quickwit config file. ```bash # Create Quickwit config file. -echo "version: 0.5 +echo "version: 0.6 node_id: searcher-1 listen_address: 0.0.0.0 metastore_uri: ${S3_PATH} @@ -70,7 +70,7 @@ default_index_root_uri: ${S3_PATH} > # config.yaml > node_id: searcher-1 > listen_address: 0.0.0.0 -> version: 0.5 +> version: 0.6 > metastore_uri: ${S3_PATH} > default_index_root_uri: ${S3_PATH} >``` @@ -95,7 +95,7 @@ used by Quickwit for [splits pruning](../../overview/architecture) at query time Check out the [index config docs](../../configuration/index-config) for more details. ```yaml title="hdfs_logs_index_config.yaml" -version: 0.5 +version: 0.6 index_id: hdfs-logs @@ -195,7 +195,7 @@ export IP_NODE_1={first-ec2-instance-public-ip} ```bash # configuration for our second node -echo "version: 0.5 +echo "version: 0.6 node_id: searcher-2 metastore_uri: ${S3_PATH} default_index_root_uri: ${S3_PATH} @@ -210,7 +210,7 @@ peer_seeds: ```bash # configuration for our third node -echo "version: 0.5 +echo "version: 0.6 node_id: searcher-3 listen_address: 0.0.0.0 peer_seeds: diff --git a/docs/get-started/tutorials/tutorial-hdfs-logs.md b/docs/get-started/tutorials/tutorial-hdfs-logs.md index 223c5a80c84..1091a42c6ad 100644 --- a/docs/get-started/tutorials/tutorial-hdfs-logs.md +++ b/docs/get-started/tutorials/tutorial-hdfs-logs.md @@ -84,7 +84,7 @@ The `timestamp_field` and `tag_fields` are used by Quickwit for [splits pruning] Check out the [index config docs](../../configuration/index-config) for more details. ```yaml title="hdfs-logs-index.yaml" -version: 0.5 +version: 0.6 index_id: hdfs-logs diff --git a/docs/guides/schemaless.md b/docs/guides/schemaless.md index 61387378608..ba854b3b72d 100644 --- a/docs/guides/schemaless.md +++ b/docs/guides/schemaless.md @@ -25,7 +25,7 @@ As a user, you need to precisely define the list of fields to be ingested by Qui For instance, a reasonable mapping for an application log could be: ```yaml title=my_strict_index.yaml -version: 0.5 +version: 0.6 index_id: my_strict_index @@ -70,7 +70,7 @@ By default, this catch-all configuration indexes and stores all of these fields, A minimalist, yet perfectly valid and useful index configuration is then: ```yaml title=my_dynamic_index.yaml -version: 0.5 +version: 0.6 index_id: my_dynamic_index doc_mapping: mode: dynamic @@ -115,7 +115,7 @@ Each event type comes with its own set of attributes. Declaring our mapping as t Instead, we can cherry-pick the fields that are common to all of the logs, and rely on dynamic mode to handle the rest. ```yaml title=my_dynamic_index.yaml -version: 0.5 +version: 0.6 index_id: my_dynamic_index doc_mapping: mode: dynamic @@ -149,7 +149,7 @@ Execute the following commands to create the index, ingest a few documents and s ```bash cat << EOF > my_dynamic_index.yaml -version: 0.5 +version: 0.6 index_id: my_dynamic_index doc_mapping: mode: dynamic @@ -219,7 +219,7 @@ Quickwit 0.3 introduced a JSON field type to handle this use case. A good index configuration here could be: ```yaml title=otel_logs.yaml -version: 0.5 +version: 0.6 index_id: otel_logs doc_mapping: mode: dynamic diff --git a/docs/ingest-data/ingest-api.md b/docs/ingest-data/ingest-api.md index 22955dc72a7..f1e43eba6a0 100644 --- a/docs/ingest-data/ingest-api.md +++ b/docs/ingest-data/ingest-api.md @@ -22,7 +22,7 @@ First, let's create a schemaless index. ```bash # Create the index config file. cat << EOF > stackoverflow-schemaless-config.yaml -version: 0.5 +version: 0.6 index_id: stackoverflow-schemaless doc_mapping: mode: dynamic diff --git a/docs/ingest-data/ingest-local-file.md b/docs/ingest-data/ingest-local-file.md index d055214d6fd..68bbec2ed5f 100644 --- a/docs/ingest-data/ingest-local-file.md +++ b/docs/ingest-data/ingest-local-file.md @@ -28,7 +28,7 @@ And create the index in a separate terminal. ```bash # Create the index config file. cat << EOF > stackoverflow-schemaless-config.yaml -version: 0.5 +version: 0.6 index_id: stackoverflow-schemaless doc_mapping: mode: dynamic diff --git a/docs/ingest-data/kafka.md b/docs/ingest-data/kafka.md index 9200f473809..b23e4124b32 100644 --- a/docs/ingest-data/kafka.md +++ b/docs/ingest-data/kafka.md @@ -22,7 +22,7 @@ First, let's create a new index. Here is the index config and doc mapping corres # # Index config file for gh-archive dataset. # -version: 0.5 +version: 0.6 index_id: gh-archive @@ -103,7 +103,7 @@ This tutorial assumes that the Kafka cluster is available locally on the default # # Kafka source config file. # -version: 0.5 +version: 0.6 source_id: kafka-source source_type: kafka params: diff --git a/docs/ingest-data/kinesis.md b/docs/ingest-data/kinesis.md index e4936dea692..01af7f172d1 100644 --- a/docs/ingest-data/kinesis.md +++ b/docs/ingest-data/kinesis.md @@ -32,7 +32,7 @@ First, let's create a new index. Here is the index config and doc mapping corres # # Index config file for gh-archive dataset. # -version: 0.5 +version: 0.6 index_id: gh-archive @@ -116,7 +116,7 @@ aws kinesis put-records --cli-input-json file://records-{%}.json --cli-binary-fo # # Kinesis source config file. # -version: 0.5 +version: 0.6 source_id: kinesis-source source_type: kinesis params: diff --git a/docs/ingest-data/pulsar.md b/docs/ingest-data/pulsar.md index e843a17bf74..d51c27645e8 100644 --- a/docs/ingest-data/pulsar.md +++ b/docs/ingest-data/pulsar.md @@ -66,7 +66,7 @@ First, let's create a new index. Here is the index config and doc mapping corres # # Index config file for Stack Overflow dataset. # -version: 0.5 +version: 0.6 index_id: stackoverflow @@ -133,7 +133,7 @@ A Pulsar source just needs to define the list of topics and the instance address # # Pulsar source config file. # -version: 0.5 +version: 0.6 source_id: pulsar-source source_type: pulsar params: diff --git a/docs/internals/backward-compatibility.md b/docs/internals/backward-compatibility.md index 1dfb7245300..e2b6ce50c2b 100644 --- a/docs/internals/backward-compatibility.md +++ b/docs/internals/backward-compatibility.md @@ -45,6 +45,7 @@ non-regression. When introducing such a change: - modify your model with the help of the attributes above. +- delete the old files created for the current version - commit the 2 files that were autogenerated by build.rs - eyeball the diff on the `.expected.json` that failed, and send it with your PR. @@ -70,6 +71,7 @@ pub(crate) enum VersionedXXXXXX { - Complete the conversion from VersionedXXXX to - make sure the conversion `From for VersionedXXXX` creates the new item. - run unit tests +- delete the old files created for the current version - commit the 2 files that were autogenerated by build.rs - eyeball and commit the autoupdated `expected.json` files - Possibly update the generation of the default XXXX instance used for regression. It is in the function `sample_for_regression_tests`. diff --git a/docs/log-management/otel-service.md b/docs/log-management/otel-service.md index 7e039272784..63b956ef520 100644 --- a/docs/log-management/otel-service.md +++ b/docs/log-management/otel-service.md @@ -24,7 +24,7 @@ The doc mapping of this index described below is derived from the [OpenTelemetry ```yaml -version: 0.5 +version: 0.6 index_id: otel-logs-v0 @@ -107,7 +107,7 @@ You can also send traces to Quickwit that you can visualize in Jaeger UI, as exp ## Known limitations -There are a few limitations on the log management setup in Quickwit 0.5: +There are a few limitations on the log management setup in Quickwit 0.6: - Aggregations are not available on sparse fields and JSON field, this will be fixed in 0.6. This means that only the timestamp field can support aggregations. - The ingest API does not provide High-Availability and High-Durability, this will be fixed in Q2/Q3. - Grafana and Elasticsearch query API support are planned for Q2 2023. diff --git a/docs/log-management/send-logs/using-fluentbit.md b/docs/log-management/send-logs/using-fluentbit.md index a64c614c838..d8fb6dab781 100644 --- a/docs/log-management/send-logs/using-fluentbit.md +++ b/docs/log-management/send-logs/using-fluentbit.md @@ -27,7 +27,7 @@ Let's create a schemaless index with only one field `timestamp`. The mode `dynam ```yaml title="index-config.yaml" -version: 0.5 +version: 0.6 index_id: fluentbit-logs diff --git a/docs/log-management/send-logs/using-vector.md b/docs/log-management/send-logs/using-vector.md index b3b9e6df73e..fcccaddcdcf 100644 --- a/docs/log-management/send-logs/using-vector.md +++ b/docs/log-management/send-logs/using-vector.md @@ -51,7 +51,7 @@ Let's embrace the OpenTelemetry standard and create an index compatible with its # Link: https://github.com/open-telemetry/opentelemetry-specification/blob/main/specification/logs/data-model.md # -version: 0.5 +version: 0.6 index_id: vector-otel-logs diff --git a/docs/reference/rest-api.md b/docs/reference/rest-api.md index a7fc660ac5c..a623ae4966c 100644 --- a/docs/reference/rest-api.md +++ b/docs/reference/rest-api.md @@ -258,7 +258,7 @@ curl -XPOST http://0.0.0.0:8080/api/v1/indexes --data @index_config.json -H "Con ```json title="index_config.json { - "version": "0.5", + "version": "0.6", "index_id": "hdfs-logs", "doc_mapping": { "field_mappings": [ @@ -435,7 +435,7 @@ curl -XPOST http://0.0.0.0:8080/api/v1/indexes/my-index/sources --data @source_c ```json title="source_config.json { - "version": "0.5", + "version": "0.6", "source_id": "kafka-source", "source_type": "kafka", "params": { diff --git a/docs/telemetry.md b/docs/telemetry.md index 79092f3ae3e..b2a651d0f31 100644 --- a/docs/telemetry.md +++ b/docs/telemetry.md @@ -16,7 +16,7 @@ export QW_DISABLE_TELEMETRY=1 Look at `--help` command output to check whether telemetry is enabled or not: ```bash quickwit --help -Quickwit 0.5.0 +Quickwit 0.6.0 Sub-second search & analytics engine on cloud storage. Find more information at https://quickwit.io/docs diff --git a/quickwit/Cargo.lock b/quickwit/Cargo.lock index 63b96800e22..b0bd04f17ba 100644 --- a/quickwit/Cargo.lock +++ b/quickwit/Cargo.lock @@ -3913,7 +3913,7 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3" [[package]] name = "quickwit-actors" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -3932,7 +3932,7 @@ dependencies = [ [[package]] name = "quickwit-aws" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -3952,7 +3952,7 @@ dependencies = [ [[package]] name = "quickwit-cli" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4009,7 +4009,7 @@ dependencies = [ [[package]] name = "quickwit-cluster" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4035,7 +4035,7 @@ dependencies = [ [[package]] name = "quickwit-codegen" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "heck 0.4.1", @@ -4051,7 +4051,7 @@ dependencies = [ [[package]] name = "quickwit-codegen-example" -version = "0.5.0" +version = "0.6.0" dependencies = [ "async-trait", "dyn-clone", @@ -4073,7 +4073,7 @@ dependencies = [ [[package]] name = "quickwit-common" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-speed-limit", @@ -4111,7 +4111,7 @@ dependencies = [ [[package]] name = "quickwit-config" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "byte-unit", @@ -4141,7 +4141,7 @@ dependencies = [ [[package]] name = "quickwit-control-plane" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4178,7 +4178,7 @@ dependencies = [ [[package]] name = "quickwit-core" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4210,7 +4210,7 @@ dependencies = [ [[package]] name = "quickwit-directories" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4231,7 +4231,7 @@ dependencies = [ [[package]] name = "quickwit-doc-mapper" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "base64 0.21.0", @@ -4263,7 +4263,7 @@ dependencies = [ [[package]] name = "quickwit-grpc-clients" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4282,7 +4282,7 @@ dependencies = [ [[package]] name = "quickwit-indexing" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "arc-swap", @@ -4339,7 +4339,7 @@ dependencies = [ [[package]] name = "quickwit-ingest" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4375,7 +4375,7 @@ dependencies = [ [[package]] name = "quickwit-integration-tests" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "bytes", @@ -4405,7 +4405,7 @@ dependencies = [ [[package]] name = "quickwit-jaeger" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4431,7 +4431,7 @@ dependencies = [ [[package]] name = "quickwit-janitor" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4468,7 +4468,7 @@ dependencies = [ [[package]] name = "quickwit-macros" -version = "0.5.0" +version = "0.6.0" dependencies = [ "proc-macro2", "quickwit-macros-impl", @@ -4476,7 +4476,7 @@ dependencies = [ [[package]] name = "quickwit-macros-impl" -version = "0.5.0" +version = "0.6.0" dependencies = [ "heck 0.4.1", "proc-macro2", @@ -4486,7 +4486,7 @@ dependencies = [ [[package]] name = "quickwit-metastore" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4537,7 +4537,7 @@ dependencies = [ [[package]] name = "quickwit-opentelemetry" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4558,7 +4558,7 @@ dependencies = [ [[package]] name = "quickwit-proto" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "glob", @@ -4579,7 +4579,7 @@ dependencies = [ [[package]] name = "quickwit-query" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "base64 0.21.0", @@ -4594,7 +4594,7 @@ dependencies = [ [[package]] name = "quickwit-rest-client" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "bytes", @@ -4618,7 +4618,7 @@ dependencies = [ [[package]] name = "quickwit-search" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "assert-json-diff", @@ -4666,7 +4666,7 @@ dependencies = [ [[package]] name = "quickwit-serve" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "assert-json-diff", @@ -4726,7 +4726,7 @@ dependencies = [ [[package]] name = "quickwit-storage" -version = "0.5.0" +version = "0.6.0" dependencies = [ "anyhow", "async-trait", @@ -4763,7 +4763,7 @@ dependencies = [ [[package]] name = "quickwit-telemetry" -version = "0.5.0" +version = "0.6.0" dependencies = [ "async-trait", "encoding_rs", diff --git a/quickwit/Cargo.toml b/quickwit/Cargo.toml index 4c54be60eb1..6d507d5573b 100644 --- a/quickwit/Cargo.toml +++ b/quickwit/Cargo.toml @@ -196,34 +196,34 @@ uuid = { version = "1.3", features = ["v4", "serde"] } warp = "0.3" wiremock = "0.5" -quickwit-actors = { version = "0.5.0", path = "./quickwit-actors" } -quickwit-aws = { version = "0.5.0", path = "./quickwit-aws" } -quickwit-cluster = { version = "0.5.0", path = "./quickwit-cluster" } -quickwit-codegen = { version = "0.5.0", path = "./quickwit-codegen" } -quickwit-codegen-example = { version = "0.5.0", path = "./quickwit-codegen/example" } -quickwit-common = { version = "0.5.0", path = "./quickwit-common" } -quickwit-config = { version = "0.5.0", path = "./quickwit-config" } -quickwit-control-plane = { version = "0.5.0", path = "./quickwit-control-plane" } -quickwit-core = { version = "0.5.0", path = "./quickwit-core" } -quickwit-directories = { version = "0.5.0", path = "./quickwit-directories" } -quickwit-doc-mapper = { version = "0.5.0", path = "./quickwit-doc-mapper" } -quickwit-grpc-clients = { version = "0.5.0", path = "./quickwit-grpc-clients" } -quickwit-indexing = { version = "0.5.0", path = "./quickwit-indexing" } -quickwit-ingest = { version = "0.5.0", path = "./quickwit-ingest" } -quickwit-integration-tests = { version = "0.5.0", path = "./quickwit-integration-tests" } -quickwit-jaeger = { version = "0.5.0", path = "./quickwit-jaeger" } -quickwit-janitor = { version = "0.5.0", path = "./quickwit-janitor" } -quickwit-macros = { version = "0.5.0", path = "./quickwit-macros" } -quickwit-macros-impl = { version = "0.5.0", path = "./quickwit-macros/impl" } -quickwit-metastore = { version = "0.5.0", path = "./quickwit-metastore" } -quickwit-opentelemetry = { version = "0.5.0", path = "./quickwit-opentelemetry" } -quickwit-proto = { version = "0.5.0", path = "./quickwit-proto" } -quickwit-query = { version = "0.5.0", path = "./quickwit-query" } -quickwit-rest-client = { version = "0.5.0", path = "./quickwit-rest-client" } -quickwit-search = { version = "0.5.0", path = "./quickwit-search" } -quickwit-serve = { version = "0.5.0", path = "./quickwit-serve" } -quickwit-storage = { version = "0.5.0", path = "./quickwit-storage" } -quickwit-telemetry = { version = "0.5.0", path = "./quickwit-telemetry" } +quickwit-actors = { version = "0.6.0", path = "./quickwit-actors" } +quickwit-aws = { version = "0.6.0", path = "./quickwit-aws" } +quickwit-cluster = { version = "0.6.0", path = "./quickwit-cluster" } +quickwit-codegen = { version = "0.6.0", path = "./quickwit-codegen" } +quickwit-codegen-example = { version = "0.6.0", path = "./quickwit-codegen/example" } +quickwit-common = { version = "0.6.0", path = "./quickwit-common" } +quickwit-config = { version = "0.6.0", path = "./quickwit-config" } +quickwit-control-plane = { version = "0.6.0", path = "./quickwit-control-plane" } +quickwit-core = { version = "0.6.0", path = "./quickwit-core" } +quickwit-directories = { version = "0.6.0", path = "./quickwit-directories" } +quickwit-doc-mapper = { version = "0.6.0", path = "./quickwit-doc-mapper" } +quickwit-grpc-clients = { version = "0.6.0", path = "./quickwit-grpc-clients" } +quickwit-indexing = { version = "0.6.0", path = "./quickwit-indexing" } +quickwit-ingest = { version = "0.6.0", path = "./quickwit-ingest" } +quickwit-integration-tests = { version = "0.6.0", path = "./quickwit-integration-tests" } +quickwit-jaeger = { version = "0.6.0", path = "./quickwit-jaeger" } +quickwit-janitor = { version = "0.6.0", path = "./quickwit-janitor" } +quickwit-macros = { version = "0.6.0", path = "./quickwit-macros" } +quickwit-macros-impl = { version = "0.6.0", path = "./quickwit-macros/impl" } +quickwit-metastore = { version = "0.6.0", path = "./quickwit-metastore" } +quickwit-opentelemetry = { version = "0.6.0", path = "./quickwit-opentelemetry" } +quickwit-proto = { version = "0.6.0", path = "./quickwit-proto" } +quickwit-query = { version = "0.6.0", path = "./quickwit-query" } +quickwit-rest-client = { version = "0.6.0", path = "./quickwit-rest-client" } +quickwit-search = { version = "0.6.0", path = "./quickwit-search" } +quickwit-serve = { version = "0.6.0", path = "./quickwit-serve" } +quickwit-storage = { version = "0.6.0", path = "./quickwit-storage" } +quickwit-telemetry = { version = "0.6.0", path = "./quickwit-telemetry" } tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "2dfe379", default-features = false, features = [ "mmap", diff --git a/quickwit/quickwit-actors/Cargo.toml b/quickwit/quickwit-actors/Cargo.toml index c4dea0b51f1..303856eaefa 100644 --- a/quickwit/quickwit-actors/Cargo.toml +++ b/quickwit/quickwit-actors/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-actors" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "MIT" diff --git a/quickwit/quickwit-aws/Cargo.toml b/quickwit/quickwit-aws/Cargo.toml index 807665d198e..944bab0d7ee 100644 --- a/quickwit/quickwit-aws/Cargo.toml +++ b/quickwit/quickwit-aws/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-aws" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-cli/Cargo.toml b/quickwit/quickwit-cli/Cargo.toml index 56e77108eb3..768e48d1a35 100644 --- a/quickwit/quickwit-cli/Cargo.toml +++ b/quickwit/quickwit-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-cli" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-cli/src/cli_doc_ext.toml b/quickwit/quickwit-cli/src/cli_doc_ext.toml index 4de34d0e708..28dcfadd5c0 100644 --- a/quickwit/quickwit-cli/src/cli_doc_ext.toml +++ b/quickwit/quickwit-cli/src/cli_doc_ext.toml @@ -232,7 +232,7 @@ quickwit run --service metastore --config=./config/quickwit.yaml # Open a new terminal and run: cat << EOF > wikipedia-kafka-source.json { - "version": "0.5", + "version": "0.6", "source_id": "kafka-source", "source_type": "kafka", "params": { diff --git a/quickwit/quickwit-cli/tests/helpers.rs b/quickwit/quickwit-cli/tests/helpers.rs index 66e88d7014c..8791ae5380d 100644 --- a/quickwit/quickwit-cli/tests/helpers.rs +++ b/quickwit/quickwit-cli/tests/helpers.rs @@ -38,7 +38,7 @@ use tracing::error; pub const PACKAGE_BIN_NAME: &str = "quickwit"; const DEFAULT_INDEX_CONFIG: &str = r#" - version: 0.5 + version: 0.6 index_id: #index_id index_uri: #index_uri @@ -78,7 +78,7 @@ const DEFAULT_INDEX_CONFIG: &str = r#" "#; const DEFAULT_QUICKWIT_CONFIG: &str = r#" - version: 0.5 + version: 0.6 metastore_uri: #metastore_uri data_dir: #data_dir rest_listen_port: #rest_listen_port diff --git a/quickwit/quickwit-cluster/Cargo.toml b/quickwit/quickwit-cluster/Cargo.toml index 3bab14c5b4a..111a64a0bf5 100644 --- a/quickwit/quickwit-cluster/Cargo.toml +++ b/quickwit/quickwit-cluster/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-cluster" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-codegen/Cargo.toml b/quickwit/quickwit-codegen/Cargo.toml index a582db4cc45..f7e94a8569f 100644 --- a/quickwit/quickwit-codegen/Cargo.toml +++ b/quickwit/quickwit-codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-codegen" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-codegen/example/Cargo.toml b/quickwit/quickwit-codegen/example/Cargo.toml index 4639a2638ca..948dc8a8582 100644 --- a/quickwit/quickwit-codegen/example/Cargo.toml +++ b/quickwit/quickwit-codegen/example/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-codegen-example" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-common/Cargo.toml b/quickwit/quickwit-common/Cargo.toml index 51a90b93d3f..59f8fa92f58 100644 --- a/quickwit/quickwit-common/Cargo.toml +++ b/quickwit/quickwit-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-common" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-config/Cargo.toml b/quickwit/quickwit-config/Cargo.toml index 91762c4b94f..195208f4877 100644 --- a/quickwit/quickwit-config/Cargo.toml +++ b/quickwit/quickwit-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-config" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial license, contact hello@quickwit.io diff --git a/quickwit/quickwit-config/resources/tests/config/quickwit.json b/quickwit/quickwit-config/resources/tests/config/quickwit.json index 0e79d53fd6c..0a18b8b2119 100644 --- a/quickwit/quickwit-config/resources/tests/config/quickwit.json +++ b/quickwit/quickwit-config/resources/tests/config/quickwit.json @@ -1,6 +1,6 @@ # Comments are supported. { - "version": "0.5", + "version": "0.6", "cluster_id": "quickwit-cluster", "node_id": "my-unique-node-id", "enabled_services": [ diff --git a/quickwit/quickwit-config/resources/tests/config/quickwit.toml b/quickwit/quickwit-config/resources/tests/config/quickwit.toml index 7b9df8741f8..41509348341 100644 --- a/quickwit/quickwit-config/resources/tests/config/quickwit.toml +++ b/quickwit/quickwit-config/resources/tests/config/quickwit.toml @@ -1,4 +1,4 @@ -version = "0.5" +version = "0.6" cluster_id = "quickwit-cluster" node_id = "my-unique-node-id" enabled_services = [ "janitor", "metastore" ] diff --git a/quickwit/quickwit-config/resources/tests/config/quickwit.wrongkey.yaml b/quickwit/quickwit-config/resources/tests/config/quickwit.wrongkey.yaml index 60c6a846c54..202fc97974d 100644 --- a/quickwit/quickwit-config/resources/tests/config/quickwit.wrongkey.yaml +++ b/quickwit/quickwit-config/resources/tests/config/quickwit.wrongkey.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 searcher: fast_field_cache_capacity: 10G # Typo here. It is supposed to be searches. diff --git a/quickwit/quickwit-config/resources/tests/config/quickwit.yaml b/quickwit/quickwit-config/resources/tests/config/quickwit.yaml index 5d5295af0c4..db6f9bb7a9b 100644 --- a/quickwit/quickwit-config/resources/tests/config/quickwit.yaml +++ b/quickwit/quickwit-config/resources/tests/config/quickwit.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 cluster_id: quickwit-cluster node_id: my-unique-node-id enabled_services: diff --git a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs-create-config.yaml b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs-create-config.yaml index fdc6a60669a..3cdb53d228a 100644 --- a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs-create-config.yaml +++ b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs-create-config.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 doc_mapping: field_mappings: diff --git a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.json b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.json index 2d3a3a76621..738162998cb 100644 --- a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.json +++ b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.json @@ -1,6 +1,6 @@ # Comments are supported. { - "version": "0.5", + "version": "0.6", "index_id": "hdfs-logs", "index_uri": "s3://quickwit-indexes/hdfs-logs", "doc_mapping": { diff --git a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.toml b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.toml index 50414a1c7eb..dc5ddcefb3d 100644 --- a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.toml +++ b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.toml @@ -1,4 +1,4 @@ -version = "0.5" +version = "0.6" index_id = "hdfs-logs" index_uri = "s3://quickwit-indexes/hdfs-logs" diff --git a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.yaml b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.yaml index 3735ae4a3f0..c8658f9107a 100644 --- a/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.yaml +++ b/quickwit/quickwit-config/resources/tests/index_config/hdfs-logs.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 index_id: hdfs-logs index_uri: s3://quickwit-indexes/hdfs-logs diff --git a/quickwit/quickwit-config/resources/tests/index_config/minimal-hdfs-logs.yaml b/quickwit/quickwit-config/resources/tests/index_config/minimal-hdfs-logs.yaml index ec50ffd898b..266553619bc 100644 --- a/quickwit/quickwit-config/resources/tests/index_config/minimal-hdfs-logs.yaml +++ b/quickwit/quickwit-config/resources/tests/index_config/minimal-hdfs-logs.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 index_id: hdfs-logs index_uri: s3://quickwit-indexes/hdfs-logs diff --git a/quickwit/quickwit-config/resources/tests/index_config/partial-hdfs-logs.yaml b/quickwit/quickwit-config/resources/tests/index_config/partial-hdfs-logs.yaml index 48dd976f914..9e00e789f93 100644 --- a/quickwit/quickwit-config/resources/tests/index_config/partial-hdfs-logs.yaml +++ b/quickwit/quickwit-config/resources/tests/index_config/partial-hdfs-logs.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 index_id: hdfs-logs index_uri: s3://quickwit-indexes/hdfs-logs diff --git a/quickwit/quickwit-config/resources/tests/source_config/ingest-api-source.json b/quickwit/quickwit-config/resources/tests/source_config/ingest-api-source.json index 7f9d84ca67c..00aae0e25f3 100644 --- a/quickwit/quickwit-config/resources/tests/source_config/ingest-api-source.json +++ b/quickwit/quickwit-config/resources/tests/source_config/ingest-api-source.json @@ -1,5 +1,5 @@ { - "version": "0.5", + "version": "0.6", "source_id": "_ingest-api-source", "enabled": true, "source_type": "ingest-api", diff --git a/quickwit/quickwit-config/resources/tests/source_config/invalid-void-source.json b/quickwit/quickwit-config/resources/tests/source_config/invalid-void-source.json index 744b9cdc62b..238efe3f198 100644 --- a/quickwit/quickwit-config/resources/tests/source_config/invalid-void-source.json +++ b/quickwit/quickwit-config/resources/tests/source_config/invalid-void-source.json @@ -1,5 +1,5 @@ { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-void-source", "desired_num_pipelines": 0, "max_num_pipelines_per_indexer": 1, diff --git a/quickwit/quickwit-config/resources/tests/source_config/kafka-source.json b/quickwit/quickwit-config/resources/tests/source_config/kafka-source.json index 0ff9ddb8765..aec4977ec1b 100644 --- a/quickwit/quickwit-config/resources/tests/source_config/kafka-source.json +++ b/quickwit/quickwit-config/resources/tests/source_config/kafka-source.json @@ -1,5 +1,5 @@ { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-kafka-source", "desired_num_pipelines": 2, "max_num_pipelines_per_indexer": 2, diff --git a/quickwit/quickwit-config/resources/tests/source_config/kinesis-source.yaml b/quickwit/quickwit-config/resources/tests/source_config/kinesis-source.yaml index 8e52ecd2011..b7d1942ae02 100644 --- a/quickwit/quickwit-config/resources/tests/source_config/kinesis-source.yaml +++ b/quickwit/quickwit-config/resources/tests/source_config/kinesis-source.yaml @@ -1,4 +1,4 @@ -version: 0.5 +version: 0.6 source_id: hdfs-logs-kinesis-source source_type: kinesis params: diff --git a/quickwit/quickwit-config/src/index_config/mod.rs b/quickwit/quickwit-config/src/index_config/mod.rs index 9b90f23478a..b2fa0a6684e 100644 --- a/quickwit/quickwit-config/src/index_config/mod.rs +++ b/quickwit/quickwit-config/src/index_config/mod.rs @@ -676,7 +676,7 @@ mod tests { #[should_panic(expected = "empty URI")] fn test_config_validates_uris() { let config_yaml = r#" - version: 0.5 + version: 0.6 index_id: hdfs-logs index_uri: '' doc_mapping: {} @@ -687,7 +687,7 @@ mod tests { #[test] fn test_minimal_index_config_default_lenient() { let config_yaml = r#" - version: 0.5 + version: 0.6 index_id: hdfs-logs index_uri: "s3://my-index" doc_mapping: {} @@ -704,7 +704,7 @@ mod tests { #[test] fn test_index_config_with_malformed_maturation_duration() { let config_yaml = r#" - version: 0.5 + version: 0.6 index_id: hdfs-logs index_uri: "s3://my-index" doc_mapping: {} diff --git a/quickwit/quickwit-config/src/index_config/serialize.rs b/quickwit/quickwit-config/src/index_config/serialize.rs index eea1fa63eaf..cbfe13384e4 100644 --- a/quickwit/quickwit-config/src/index_config/serialize.rs +++ b/quickwit/quickwit-config/src/index_config/serialize.rs @@ -28,21 +28,22 @@ use crate::{ }; /// Alias for the latest serialization format. -type IndexConfigForSerialization = IndexConfigV0_5; +type IndexConfigForSerialization = IndexConfigV0_6; #[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)] #[serde(tag = "version")] pub(crate) enum VersionedIndexConfig { - #[serde(rename = "0.5")] - // Retro compatibility with 0.4. + #[serde(rename = "0.6")] + // Retro compatibility #[serde(alias = "0.4")] - V0_5(IndexConfigV0_5), + #[serde(alias = "0.5")] + V0_6(IndexConfigV0_6), } impl From for IndexConfigForSerialization { fn from(versioned_config: VersionedIndexConfig) -> IndexConfigForSerialization { match versioned_config { - VersionedIndexConfig::V0_5(v0_5) => v0_5, + VersionedIndexConfig::V0_6(v0_6) => v0_6, } } } @@ -117,7 +118,7 @@ impl IndexConfigForSerialization { impl From for VersionedIndexConfig { fn from(index_config: IndexConfig) -> Self { - VersionedIndexConfig::V0_5(index_config.into()) + VersionedIndexConfig::V0_6(index_config.into()) } } @@ -126,14 +127,14 @@ impl TryFrom for IndexConfig { fn try_from(versioned_index_config: VersionedIndexConfig) -> anyhow::Result { match versioned_index_config { - VersionedIndexConfig::V0_5(v0_5) => v0_5.validate_and_build(None), + VersionedIndexConfig::V0_6(v0_6) => v0_6.validate_and_build(None), } } } #[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)] #[serde(deny_unknown_fields)] -pub struct IndexConfigV0_5 { +pub struct IndexConfigV0_6 { pub index_id: String, #[schema(value_type = String)] #[serde(default)] @@ -148,9 +149,9 @@ pub struct IndexConfigV0_5 { pub retention_policy: Option, } -impl From for IndexConfigV0_5 { +impl From for IndexConfigV0_6 { fn from(index_config: IndexConfig) -> Self { - IndexConfigV0_5 { + IndexConfigV0_6 { index_id: index_config.index_id, index_uri: Some(index_config.index_uri), doc_mapping: index_config.doc_mapping, @@ -227,7 +228,7 @@ mod test { #[test] fn test_minimal_index_config_missing_root_uri_no_default_uri() { let config_yaml = r#" - version: 0.5 + version: 0.6 index_id: hdfs-logs doc_mapping: {} "#; @@ -239,7 +240,7 @@ mod test { #[test] fn test_minimal_index_config_missing_root_uri_with_default_index_root_uri() { let config_yaml = r#" - version: 0.5 + version: 0.6 index_id: hdfs-logs doc_mapping: {} "#; diff --git a/quickwit/quickwit-config/src/lib.rs b/quickwit/quickwit-config/src/lib.rs index 2f0475945c9..8432ea36550 100644 --- a/quickwit/quickwit-config/src/lib.rs +++ b/quickwit/quickwit-config/src/lib.rs @@ -39,7 +39,7 @@ mod templating; // We export that one for backward compatibility. // See #2048 -use index_config::serialize::{IndexConfigV0_5, VersionedIndexConfig}; +use index_config::serialize::{IndexConfigV0_6, VersionedIndexConfig}; pub use index_config::{ build_doc_mapper, load_index_config_from_user_config, DocMapping, IndexConfig, IndexingResources, IndexingSettings, RetentionPolicy, SearchSettings, @@ -62,7 +62,7 @@ pub use crate::quickwit_config::{ IndexerConfig, IngestApiConfig, JaegerConfig, QuickwitConfig, SearcherConfig, DEFAULT_QW_CONFIG_PATH, }; -use crate::source_config::serialize::{SourceConfigV0_5, VersionedSourceConfig}; +use crate::source_config::serialize::{SourceConfigV0_6, VersionedSourceConfig}; #[derive(utoipa::OpenApi)] #[openapi(components(schemas( @@ -73,9 +73,9 @@ use crate::source_config::serialize::{SourceConfigV0_5, VersionedSourceConfig}; MergePolicyConfig, DocMapping, VersionedSourceConfig, - SourceConfigV0_5, + SourceConfigV0_6, VersionedIndexConfig, - IndexConfigV0_5, + IndexConfigV0_6, SourceInputFormat, SourceParams, FileSourceParams, diff --git a/quickwit/quickwit-config/src/quickwit_config/serialize.rs b/quickwit/quickwit-config/src/quickwit_config/serialize.rs index d6f9d335db1..29c6f76e973 100644 --- a/quickwit/quickwit-config/src/quickwit_config/serialize.rs +++ b/quickwit/quickwit-config/src/quickwit_config/serialize.rs @@ -139,16 +139,17 @@ pub async fn load_quickwit_config_with_env( #[derive(Debug, Deserialize)] #[serde(tag = "version")] enum VersionedQuickwitConfig { - #[serde(rename = "0.5")] - // Retro compatibility with 0.4. + #[serde(rename = "0.6")] + // Retro compatibility. + #[serde(alias = "0.5")] #[serde(alias = "0.4")] - V0_5(QuickwitConfigBuilder), + V0_6(QuickwitConfigBuilder), } impl From for QuickwitConfigBuilder { fn from(versioned_quickwit_config: VersionedQuickwitConfig) -> Self { match versioned_quickwit_config { - VersionedQuickwitConfig::V0_5(quickwit_config_builder) => quickwit_config_builder, + VersionedQuickwitConfig::V0_6(quickwit_config_builder) => quickwit_config_builder, } } } @@ -512,7 +513,7 @@ mod tests { #[tokio::test] async fn test_quickwit_config_default_values_minimal() { - let config_yaml = "version: 0.5"; + let config_yaml = "version: 0.6"; let config = load_quickwit_config_with_env( ConfigFormat::Yaml, config_yaml.as_bytes(), @@ -560,7 +561,7 @@ mod tests { #[tokio::test] async fn test_quickwit_config_env_var_override() { - let config_yaml = "version: 0.5"; + let config_yaml = "version: 0.6"; let mut env_vars = HashMap::new(); env_vars.insert("QW_CLUSTER_ID".to_string(), "test-cluster".to_string()); env_vars.insert("QW_NODE_ID".to_string(), "test-node".to_string()); @@ -642,7 +643,7 @@ mod tests { #[tokio::test] async fn test_quickwwit_config_default_values_storage() { let config_yaml = r#" - version: 0.5 + version: 0.6 node_id: "node-1" metastore_uri: postgres://username:password@host:port/db "#; @@ -664,7 +665,7 @@ mod tests { #[tokio::test] async fn test_quickwit_config_config_default_values_default_indexer_searcher_config() { let config_yaml = r#" - version: 0.5 + version: 0.6 metastore_uri: postgres://username:password@host:port/db data_dir: /opt/quickwit/data "#; @@ -840,7 +841,7 @@ mod tests { async fn test_config_validates_uris() { { let config_yaml = r#" - version: 0.5 + version: 0.6 node_id: 1 metastore_uri: '' "#; @@ -854,7 +855,7 @@ mod tests { } { let config_yaml = r#" - version: 0.5 + version: 0.6 node_id: 1 metastore_uri: postgres://username:password@host:port/db default_index_root_uri: '' @@ -873,7 +874,7 @@ mod tests { async fn test_quickwit_config_data_dir_accepts_both_file_uris_and_file_paths() { { let config_yaml = r#" - version: 0.5 + version: 0.6 data_dir: /opt/quickwit/data "#; let config = load_quickwit_config_with_env( @@ -887,7 +888,7 @@ mod tests { } { let config_yaml = r#" - version: 0.5 + version: 0.6 data_dir: file:///opt/quickwit/data "#; let config = load_quickwit_config_with_env( @@ -901,7 +902,7 @@ mod tests { } { let config_yaml = r#" - version: 0.5 + version: 0.6 data_dir: s3://indexes/foo "#; let error = load_quickwit_config_with_env( @@ -930,7 +931,7 @@ mod tests { #[tokio::test] async fn test_rest_config_accepts_wildcard() { let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: '*' "#; let config = load_quickwit_config_with_env( @@ -946,7 +947,7 @@ mod tests { #[tokio::test] async fn test_rest_config_accepts_single_origin() { let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: https://www.my-domain.com "#; let config = load_quickwit_config_with_env( @@ -962,7 +963,7 @@ mod tests { ); let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: http://192.168.0.108:7280 "#; let config = load_quickwit_config_with_env( @@ -981,7 +982,7 @@ mod tests { #[tokio::test] async fn test_rest_config_accepts_multi_origin() { let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: - https://www.my-domain.com "#; @@ -998,7 +999,7 @@ mod tests { ); let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: - https://www.my-domain.com - https://www.my-other-domain.com @@ -1019,7 +1020,7 @@ mod tests { ); let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: "#; load_quickwit_config_with_env( @@ -1031,7 +1032,7 @@ mod tests { .expect_err("Config should not allow empty origins."); let rest_config_yaml = r#" - version: 0.5 + version: 0.6 rest_cors_allow_origins: - "#; diff --git a/quickwit/quickwit-config/src/source_config/mod.rs b/quickwit/quickwit-config/src/source_config/mod.rs index 1264c14bbf9..a417ec3b8f0 100644 --- a/quickwit/quickwit-config/src/source_config/mod.rs +++ b/quickwit/quickwit-config/src/source_config/mod.rs @@ -613,7 +613,7 @@ mod tests { { let content = r#" { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-void-source", "desired_num_pipelines": 0, "max_num_pipelines_per_indexer": 1, @@ -630,7 +630,7 @@ mod tests { { let content = r#" { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-void-source", "desired_num_pipelines": 1, "max_num_pipelines_per_indexer": 0, @@ -647,7 +647,7 @@ mod tests { { let content = r#" { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-void-source", "desired_num_pipelines": 1, "max_num_pipelines_per_indexer": 2, @@ -662,7 +662,7 @@ mod tests { { let content = r#" { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-void-source", "desired_num_pipelines": 2, "max_num_pipelines_per_indexer": 1, @@ -681,7 +681,7 @@ mod tests { { let content = r#" { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-kafka-source", "desired_num_pipelines": 3, "max_num_pipelines_per_indexer": 3, @@ -700,7 +700,7 @@ mod tests { { let content = r#" { - "version": "0.5", + "version": "0.6", "source_id": "hdfs-logs-pulsar-source", "desired_num_pipelines": 3, "max_num_pipelines_per_indexer": 3, @@ -1111,7 +1111,7 @@ mod tests { #[tokio::test] async fn test_source_config_plain_text_input_format() { let file_content = r#"{ - "version": "0.5", + "version": "0.6", "source_id": "logs-file-source", "desired_num_pipelines": 1, "max_num_pipelines_per_indexer": 1, diff --git a/quickwit/quickwit-config/src/source_config/serialize.rs b/quickwit/quickwit-config/src/source_config/serialize.rs index 0aab1dedbfb..9e86b7a7b75 100644 --- a/quickwit/quickwit-config/src/source_config/serialize.rs +++ b/quickwit/quickwit-config/src/source_config/serialize.rs @@ -28,22 +28,23 @@ use crate::{ CLI_INGEST_SOURCE_ID, INGEST_API_SOURCE_ID, }; -type SourceConfigForSerialization = SourceConfigV0_5; +type SourceConfigForSerialization = SourceConfigV0_6; #[derive(Serialize, Deserialize, utoipa::ToSchema)] #[serde(deny_unknown_fields)] #[serde(tag = "version")] pub enum VersionedSourceConfig { - #[serde(rename = "0.5")] - // Retro compatibility with 0.4. + #[serde(rename = "0.6")] + // Retro compatibility. + #[serde(alias = "0.5")] #[serde(alias = "0.4")] - V0_5(SourceConfigV0_5), + V0_6(SourceConfigV0_6), } impl From for SourceConfigForSerialization { fn from(versioned_source_config: VersionedSourceConfig) -> Self { match versioned_source_config { - VersionedSourceConfig::V0_5(v0_5) => v0_5, + VersionedSourceConfig::V0_6(v0_6) => v0_6, } } } @@ -121,9 +122,9 @@ impl SourceConfigForSerialization { } } -impl From for SourceConfigV0_5 { +impl From for SourceConfigV0_6 { fn from(source_config: SourceConfig) -> Self { - SourceConfigV0_5 { + SourceConfigV0_6 { source_id: source_config.source_id, max_num_pipelines_per_indexer: source_config.max_num_pipelines_per_indexer.get(), desired_num_pipelines: source_config.desired_num_pipelines.get(), @@ -137,7 +138,7 @@ impl From for SourceConfigV0_5 { impl From for VersionedSourceConfig { fn from(source_config: SourceConfig) -> Self { - VersionedSourceConfig::V0_5(source_config.into()) + VersionedSourceConfig::V0_6(source_config.into()) } } @@ -145,7 +146,7 @@ impl TryFrom for SourceConfig { type Error = anyhow::Error; fn try_from(versioned_source_config: VersionedSourceConfig) -> anyhow::Result { - let v1: SourceConfigV0_5 = versioned_source_config.into(); + let v1: SourceConfigV0_6 = versioned_source_config.into(); v1.validate_and_build() } } @@ -163,7 +164,7 @@ fn default_source_enabled() -> bool { } #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize, utoipa::ToSchema)] -pub struct SourceConfigV0_5 { +pub struct SourceConfigV0_6 { pub source_id: String, #[serde( diff --git a/quickwit/quickwit-control-plane/Cargo.toml b/quickwit/quickwit-control-plane/Cargo.toml index 9d6b682d48f..f410ae30a1f 100644 --- a/quickwit/quickwit-control-plane/Cargo.toml +++ b/quickwit/quickwit-control-plane/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-control-plane" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-core/Cargo.toml b/quickwit/quickwit-core/Cargo.toml index 52c293edb74..8bf5517c97e 100644 --- a/quickwit/quickwit-core/Cargo.toml +++ b/quickwit/quickwit-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-core" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-directories/Cargo.toml b/quickwit/quickwit-directories/Cargo.toml index ea50ad4abfd..dd19224f3f1 100644 --- a/quickwit/quickwit-directories/Cargo.toml +++ b/quickwit/quickwit-directories/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-directories" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-doc-mapper/Cargo.toml b/quickwit/quickwit-doc-mapper/Cargo.toml index 85c86372f39..aec19571ba1 100644 --- a/quickwit/quickwit-doc-mapper/Cargo.toml +++ b/quickwit/quickwit-doc-mapper/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-doc-mapper" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-grpc-clients/Cargo.toml b/quickwit/quickwit-grpc-clients/Cargo.toml index ee581135c10..48d83740a1e 100644 --- a/quickwit/quickwit-grpc-clients/Cargo.toml +++ b/quickwit/quickwit-grpc-clients/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-grpc-clients" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-indexing/Cargo.toml b/quickwit/quickwit-indexing/Cargo.toml index a6ce988c71f..3c55db320f4 100644 --- a/quickwit/quickwit-indexing/Cargo.toml +++ b/quickwit/quickwit-indexing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-indexing" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-ingest/Cargo.toml b/quickwit/quickwit-ingest/Cargo.toml index b377fbad777..9f966862d0b 100644 --- a/quickwit/quickwit-ingest/Cargo.toml +++ b/quickwit/quickwit-ingest/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-ingest" -version = "0.5.0" +version = "0.6.0" edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io description = "Quickwit is a cost-efficient search engine." diff --git a/quickwit/quickwit-integration-tests/Cargo.toml b/quickwit/quickwit-integration-tests/Cargo.toml index b85bdb8f071..d5383129d83 100644 --- a/quickwit/quickwit-integration-tests/Cargo.toml +++ b/quickwit/quickwit-integration-tests/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-integration-tests" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-integration-tests/src/tests/basic_tests.rs b/quickwit/quickwit-integration-tests/src/tests/basic_tests.rs index 44543174f04..562827198af 100644 --- a/quickwit/quickwit-integration-tests/src/tests/basic_tests.rs +++ b/quickwit/quickwit-integration-tests/src/tests/basic_tests.rs @@ -97,7 +97,7 @@ async fn test_standalone_server() { .indexes() .create( r#" - version: 0.5 + version: 0.6 index_id: my-new-index doc_mapping: field_mappings: @@ -167,7 +167,7 @@ async fn test_multi_nodes_cluster() { .indexes() .create( r#" - version: 0.5 + version: 0.6 index_id: my-new-multi-node-index doc_mapping: field_mappings: diff --git a/quickwit/quickwit-integration-tests/src/tests/index_tests.rs b/quickwit/quickwit-integration-tests/src/tests/index_tests.rs index 8df68ca5f97..bf3afe47ac1 100644 --- a/quickwit/quickwit-integration-tests/src/tests/index_tests.rs +++ b/quickwit/quickwit-integration-tests/src/tests/index_tests.rs @@ -35,7 +35,7 @@ async fn test_restarting_standalone_server() { let index_id = "test-index-with-restarting"; let index_config = Bytes::from(format!( r#" - version: 0.5 + version: 0.6 index_id: {} doc_mapping: field_mappings: @@ -182,7 +182,7 @@ async fn test_commit_modes() { .indexes() .create( r#" - version: 0.5 + version: 0.6 index_id: test_commit_modes_index doc_mapping: field_mappings: @@ -319,7 +319,7 @@ async fn test_shutdown() { .indexes() .create( r#" - version: 0.5 + version: 0.6 index_id: test_commit_modes_index doc_mapping: field_mappings: diff --git a/quickwit/quickwit-jaeger/Cargo.toml b/quickwit/quickwit-jaeger/Cargo.toml index e31d8d73282..fe23384f6c0 100644 --- a/quickwit/quickwit-jaeger/Cargo.toml +++ b/quickwit/quickwit-jaeger/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-jaeger" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-janitor/Cargo.toml b/quickwit/quickwit-janitor/Cargo.toml index a1964d9f580..ce52c8cd9ec 100644 --- a/quickwit/quickwit-janitor/Cargo.toml +++ b/quickwit/quickwit-janitor/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-janitor" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-macros/Cargo.toml b/quickwit/quickwit-macros/Cargo.toml index dae373549a5..6e81146d69c 100644 --- a/quickwit/quickwit-macros/Cargo.toml +++ b/quickwit/quickwit-macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-macros" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-macros/impl/Cargo.toml b/quickwit/quickwit-macros/impl/Cargo.toml index 223460c0f25..0681389d278 100644 --- a/quickwit/quickwit-macros/impl/Cargo.toml +++ b/quickwit/quickwit-macros/impl/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-macros-impl" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-metastore-utils/src/bin/README.md b/quickwit/quickwit-metastore-utils/src/bin/README.md index d218bba16db..e7dcaa68fcf 100644 --- a/quickwit/quickwit-metastore-utils/src/bin/README.md +++ b/quickwit/quickwit-metastore-utils/src/bin/README.md @@ -17,7 +17,7 @@ To get that, simply run: A minimal `quickwit.yaml` to run against the postgres could be ```yaml -version: "0.5" +version: "0.6" metastore_uri: postgres://quickwit-dev:quickwit-dev@localhost/quickwit-metastore-dev ``` diff --git a/quickwit/quickwit-metastore/Cargo.toml b/quickwit/quickwit-metastore/Cargo.toml index 01bf68789d0..31135cac126 100644 --- a/quickwit/quickwit-metastore/Cargo.toml +++ b/quickwit/quickwit-metastore/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-metastore" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-metastore/src/backward_compatibility_tests/mod.rs b/quickwit/quickwit-metastore/src/backward_compatibility_tests/mod.rs index 40757c590fa..daf8cec23d4 100644 --- a/quickwit/quickwit-metastore/src/backward_compatibility_tests/mod.rs +++ b/quickwit/quickwit-metastore/src/backward_compatibility_tests/mod.rs @@ -45,7 +45,7 @@ use crate::{IndexMetadata, SplitMetadata}; /// #[serde(rename="0.2")] /// V0_2(MyResourceV1) //< there was no change in this version. /// } -const GLOBAL_QUICKWIT_RESOURCE_VERSION: &str = "0.5"; +const GLOBAL_QUICKWIT_RESOURCE_VERSION: &str = "0.6"; /// This test makes sure that the resource is using the current `GLOBAL_QUICKWIT_RESOURCE_VERSION`. fn test_global_version(serializable: &T) -> anyhow::Result<()> { diff --git a/quickwit/quickwit-metastore/src/lib.rs b/quickwit/quickwit-metastore/src/lib.rs index 469b6f4cfee..2b186be1608 100644 --- a/quickwit/quickwit-metastore/src/lib.rs +++ b/quickwit/quickwit-metastore/src/lib.rs @@ -43,7 +43,7 @@ use std::ops::Range; pub use error::{MetastoreError, MetastoreResolverError, MetastoreResult}; pub use metastore::file_backed_metastore::FileBackedMetastore; pub use metastore::grpc_metastore::{GrpcMetastoreAdapter, MetastoreGrpcClient}; -pub(crate) use metastore::index_metadata::serialize::{IndexMetadataV0_5, VersionedIndexMetadata}; +pub(crate) use metastore::index_metadata::serialize::{IndexMetadataV0_6, VersionedIndexMetadata}; pub use metastore::metastore_event_publisher::{MetastoreEvent, MetastoreEventPublisher}; #[cfg(feature = "postgres")] pub use metastore::postgresql_metastore::PostgresqlMetastore; @@ -57,16 +57,16 @@ pub use metastore_resolver::{ use quickwit_common::is_disjoint; use quickwit_doc_mapper::tag_pruning::TagFilterAst; pub use split_metadata::{Split, SplitMetadata, SplitState}; -pub(crate) use split_metadata_version::{SplitMetadataV0_5, VersionedSplitMetadata}; +pub(crate) use split_metadata_version::{SplitMetadataV0_6, VersionedSplitMetadata}; #[derive(utoipa::OpenApi)] #[openapi(components(schemas( Split, SplitState, VersionedIndexMetadata, - IndexMetadataV0_5, + IndexMetadataV0_6, VersionedSplitMetadata, - SplitMetadataV0_5, + SplitMetadataV0_6, )))] /// Schema used for the OpenAPI generation which are apart of this crate. pub struct MetastoreApiSchemas; diff --git a/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/serialize.rs b/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/serialize.rs index ed6ca8aa133..2d0094ec0b8 100644 --- a/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/serialize.rs +++ b/quickwit/quickwit-metastore/src/metastore/file_backed_metastore/file_backed_index/serialize.rs @@ -27,28 +27,29 @@ use crate::{IndexMetadata, Split}; #[derive(Clone, Debug, Serialize, Deserialize)] #[serde(tag = "version")] pub(crate) enum VersionedFileBackedIndex { - #[serde(rename = "0.5")] - // Retro compatibility with 0.4. + #[serde(rename = "0.6")] + // Retro compatibility. + #[serde(alias = "0.5")] #[serde(alias = "0.4")] - V0_5(FileBackedIndexV0_5), + V0_6(FileBackedIndexV0_6), } impl From for VersionedFileBackedIndex { fn from(index: FileBackedIndex) -> Self { - VersionedFileBackedIndex::V0_5(index.into()) + VersionedFileBackedIndex::V0_6(index.into()) } } impl From for FileBackedIndex { fn from(index: VersionedFileBackedIndex) -> Self { match index { - VersionedFileBackedIndex::V0_5(v0_5) => v0_5.into(), + VersionedFileBackedIndex::V0_6(v0_6) => v0_6.into(), } } } #[derive(Clone, Debug, Serialize, Deserialize)] -pub(crate) struct FileBackedIndexV0_5 { +pub(crate) struct FileBackedIndexV0_6 { #[serde(rename = "index")] metadata: IndexMetadata, splits: Vec, @@ -56,7 +57,7 @@ pub(crate) struct FileBackedIndexV0_5 { delete_tasks: Vec, } -impl From for FileBackedIndexV0_5 { +impl From for FileBackedIndexV0_6 { fn from(index: FileBackedIndex) -> Self { Self { metadata: index.metadata, @@ -74,8 +75,8 @@ impl From for FileBackedIndexV0_5 { } } -impl From for FileBackedIndex { - fn from(mut index: FileBackedIndexV0_5) -> Self { +impl From for FileBackedIndex { + fn from(mut index: FileBackedIndexV0_6) -> Self { // Override split index_id to support old SplitMetadata format. for split in index.splits.iter_mut() { if split.split_metadata.index_uid.to_string().is_empty() { diff --git a/quickwit/quickwit-metastore/src/metastore/index_metadata/serialize.rs b/quickwit/quickwit-metastore/src/metastore/index_metadata/serialize.rs index 5d497a2af6b..75a0a02846e 100644 --- a/quickwit/quickwit-metastore/src/metastore/index_metadata/serialize.rs +++ b/quickwit/quickwit-metastore/src/metastore/index_metadata/serialize.rs @@ -30,15 +30,16 @@ use crate::IndexMetadata; #[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)] #[serde(tag = "version")] pub(crate) enum VersionedIndexMetadata { - #[serde(rename = "0.5")] - // Retro compatibility with 0.4. + #[serde(rename = "0.6")] + // Retro compatibility. + #[serde(alias = "0.5")] #[serde(alias = "0.4")] - V0_5(IndexMetadataV0_5), + V0_6(IndexMetadataV0_6), } impl From for VersionedIndexMetadata { fn from(index_metadata: IndexMetadata) -> Self { - VersionedIndexMetadata::V0_5(index_metadata.into()) + VersionedIndexMetadata::V0_6(index_metadata.into()) } } @@ -49,12 +50,12 @@ impl TryFrom for IndexMetadata { match index_metadata { // When we have more than one version, you should chain version conversion. // ie. Implement conversion from V_k -> V_{k+1} - VersionedIndexMetadata::V0_5(v3) => v3.try_into(), + VersionedIndexMetadata::V0_6(v6) => v6.try_into(), } } } -impl From for IndexMetadataV0_5 { +impl From for IndexMetadataV0_6 { fn from(index_metadata: IndexMetadata) -> Self { let sources: Vec = index_metadata.sources.values().cloned().collect(); Self { @@ -68,7 +69,7 @@ impl From for IndexMetadataV0_5 { } #[derive(Clone, Debug, Serialize, Deserialize, utoipa::ToSchema)] -pub(crate) struct IndexMetadataV0_5 { +pub(crate) struct IndexMetadataV0_6 { #[schema(value_type = String)] // Defaults to nil for backward compatibility. #[serde(default, alias = "index_id")] @@ -83,26 +84,26 @@ pub(crate) struct IndexMetadataV0_5 { pub sources: Vec, } -impl TryFrom for IndexMetadata { +impl TryFrom for IndexMetadata { type Error = anyhow::Error; - fn try_from(v0_5: IndexMetadataV0_5) -> anyhow::Result { + fn try_from(v0_6: IndexMetadataV0_6) -> anyhow::Result { let mut sources: HashMap = Default::default(); - for source in v0_5.sources { + for source in v0_6.sources { if sources.contains_key(&source.source_id) { anyhow::bail!("Source `{}` is defined more than once", source.source_id); } sources.insert(source.source_id.clone(), source); } Ok(Self { - index_uid: if v0_5.index_uid.is_empty() { - v0_5.index_config.index_id.clone().into() + index_uid: if v0_6.index_uid.is_empty() { + v0_6.index_config.index_id.clone().into() } else { - v0_5.index_uid + v0_6.index_uid }, - index_config: v0_5.index_config, - checkpoint: v0_5.checkpoint, - create_timestamp: v0_5.create_timestamp, + index_config: v0_6.index_config, + checkpoint: v0_6.checkpoint, + create_timestamp: v0_6.create_timestamp, sources, }) } diff --git a/quickwit/quickwit-metastore/src/split_metadata_version.rs b/quickwit/quickwit-metastore/src/split_metadata_version.rs index 69eb1559ac7..e987a0eecf5 100644 --- a/quickwit/quickwit-metastore/src/split_metadata_version.rs +++ b/quickwit/quickwit-metastore/src/split_metadata_version.rs @@ -27,7 +27,7 @@ use crate::split_metadata::utc_now_timestamp; use crate::SplitMetadata; #[derive(Clone, Debug, Default, Eq, PartialEq, Serialize, Deserialize, utoipa::ToSchema)] -pub(crate) struct SplitMetadataV0_5 { +pub(crate) struct SplitMetadataV0_6 { /// Split ID. Joined with the index URI (/), this ID /// should be enough to uniquely identify a split. /// In reality, some information may be implicitly configured @@ -88,8 +88,8 @@ pub(crate) struct SplitMetadataV0_5 { num_merge_ops: usize, } -impl From for SplitMetadata { - fn from(v3: SplitMetadataV0_5) -> Self { +impl From for SplitMetadata { + fn from(v3: SplitMetadataV0_6) -> Self { let source_id = v3.source_id.unwrap_or_else(|| "unknown".to_string()); let node_id = if let Some(node_id) = v3.node_id { @@ -124,9 +124,9 @@ impl From for SplitMetadata { } } -impl From for SplitMetadataV0_5 { +impl From for SplitMetadataV0_6 { fn from(split: SplitMetadata) -> Self { - SplitMetadataV0_5 { + SplitMetadataV0_6 { split_id: split.split_id, index_uid: split.index_uid, partition_id: split.partition_id, @@ -147,22 +147,23 @@ impl From for SplitMetadataV0_5 { #[derive(Serialize, Deserialize, utoipa::ToSchema)] #[serde(tag = "version")] pub(crate) enum VersionedSplitMetadata { - #[serde(rename = "0.5")] - // Retro compatibility with 0.4. + #[serde(rename = "0.6")] + // Retro compatibility. + #[serde(alias = "0.5")] #[serde(alias = "0.4")] - V0_5(SplitMetadataV0_5), + V0_6(SplitMetadataV0_6), } impl From for SplitMetadata { fn from(versioned_helper: VersionedSplitMetadata) -> Self { match versioned_helper { - VersionedSplitMetadata::V0_5(v0_5) => v0_5.into(), + VersionedSplitMetadata::V0_6(v0_6) => v0_6.into(), } } } impl From for VersionedSplitMetadata { fn from(split_metadata: SplitMetadata) -> Self { - VersionedSplitMetadata::V0_5(split_metadata.into()) + VersionedSplitMetadata::V0_6(split_metadata.into()) } } diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-1cfee07237d8cbbe9240d5a883bf98c2.expected.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-1cfee07237d8cbbe9240d5a883bf98c2.expected.json deleted file mode 100644 index e0a7233c52d..00000000000 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-1cfee07237d8cbbe9240d5a883bf98c2.expected.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "delete_tasks": [ - { - "create_timestamp": 0, - "delete_query": { - "index_uid": "", - "query_ast": "" - }, - "opstamp": 10 - } - ], - "index": { - "checkpoint": { - "kafka-source": { - "00000000000000000000": "00000000000000000042" - } - }, - "create_timestamp": 1789, - "index_config": { - "doc_mapping": { - "field_mappings": [ - { - "fast": true, - "indexed": true, - "name": "tenant_id", - "stored": true, - "type": "u64" - }, - { - "fast": true, - "indexed": true, - "input_formats": [ - "rfc3339", - "unix_timestamp" - ], - "name": "timestamp", - "output_format": "rfc3339", - "precision": "seconds", - "stored": true, - "type": "datetime" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "log_level", - "stored": true, - "tokenizer": "raw", - "type": "text" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "message", - "record": "position", - "stored": true, - "tokenizer": "default", - "type": "text" - } - ], - "max_num_partitions": 100, - "mode": "dynamic", - "partition_key": "tenant", - "store_source": true, - "tag_fields": [ - "log_level", - "tenant_id" - ], - "timestamp_field": "timestamp" - }, - "index_id": "my-index", - "index_uri": "s3://quickwit-indexes/my-index", - "indexing_settings": { - "commit_timeout_secs": 301, - "docstore_blocksize": 1000000, - "docstore_compression_level": 8, - "merge_policy": { - "maturation_period": "2days", - "max_merge_factor": 11, - "merge_factor": 9, - "min_level_num_docs": 100000, - "type": "stable_log" - }, - "resources": { - "heap_size": 3 - }, - "split_num_docs_target": 10000001 - }, - "retention": { - "period": "90 days", - "schedule": "daily" - }, - "search_settings": { - "default_search_fields": [ - "message" - ] - }, - "version": "0.5" - }, - "index_uid": "my-index", - "sources": [ - { - "desired_num_pipelines": 2, - "enabled": true, - "input_format": "json", - "max_num_pipelines_per_indexer": 2, - "params": { - "client_params": {}, - "topic": "kafka-topic" - }, - "source_id": "kafka-source", - "source_type": "kafka", - "transform": { - "script": ".message = downcase(string!(.message))" - }, - "version": "0.5" - } - ], - "version": "0.5" - }, - "splits": [ - { - "create_timestamp": 3, - "delete_opstamp": 10, - "footer_offsets": { - "end": 2000, - "start": 1000 - }, - "index_uid": "my-index", - "node_id": "node", - "num_docs": 12303, - "num_merge_ops": 3, - "partition_id": 7, - "publish_timestamp": 1789, - "source_id": "source", - "split_id": "split", - "split_state": "Published", - "tags": [ - "234", - "aaa" - ], - "time_range": { - "end": 130198, - "start": 121000 - }, - "uncompressed_docs_size_in_bytes": 234234, - "update_timestamp": 1789, - "version": "0.5" - } - ], - "version": "0.5" -} diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-1cfee07237d8cbbe9240d5a883bf98c2.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-1cfee07237d8cbbe9240d5a883bf98c2.json deleted file mode 100644 index 1d30e0a62e7..00000000000 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-1cfee07237d8cbbe9240d5a883bf98c2.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "delete_tasks": [ - { - "create_timestamp": 0, - "delete_query": { - "index_id": "index", - "query": "Harry Potter", - "search_fields": [] - }, - "opstamp": 10 - } - ], - "index": { - "checkpoint": { - "kafka-source": { - "00000000000000000000": "00000000000000000042" - } - }, - "create_timestamp": 1789, - "index_config": { - "doc_mapping": { - "field_mappings": [ - { - "fast": true, - "indexed": true, - "name": "tenant_id", - "stored": true, - "type": "u64" - }, - { - "fast": true, - "indexed": true, - "input_formats": [ - "rfc3339", - "unix_timestamp" - ], - "name": "timestamp", - "output_format": "rfc3339", - "precision": "seconds", - "stored": true, - "type": "datetime" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "log_level", - "stored": true, - "tokenizer": "raw", - "type": "text" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "message", - "record": "position", - "stored": true, - "tokenizer": "default", - "type": "text" - } - ], - "max_num_partitions": 100, - "mode": "dynamic", - "partition_key": "tenant", - "store_source": true, - "tag_fields": [ - "log_level", - "tenant_id" - ], - "timestamp_field": "timestamp" - }, - "index_id": "my-index", - "index_uri": "s3://quickwit-indexes/my-index", - "indexing_settings": { - "commit_timeout_secs": 301, - "docstore_blocksize": 1000000, - "docstore_compression_level": 8, - "merge_policy": { - "maturation_period": "2days", - "max_merge_factor": 11, - "merge_factor": 9, - "min_level_num_docs": 100000, - "type": "stable_log" - }, - "resources": { - "heap_size": 3 - }, - "split_num_docs_target": 10000001 - }, - "retention": { - "period": "90 days", - "schedule": "daily" - }, - "search_settings": { - "default_search_fields": [ - "message" - ] - }, - "version": "0.4" - }, - "sources": [ - { - "desired_num_pipelines": 2, - "enabled": true, - "max_num_pipelines_per_indexer": 2, - "params": { - "client_params": {}, - "topic": "kafka-topic" - }, - "source_id": "kafka-source", - "source_type": "kafka", - "transform": { - "script": ".message = downcase(string!(.message))" - }, - "version": "0.4" - } - ], - "version": "0.4" - }, - "splits": [ - { - "create_timestamp": 3, - "delete_opstamp": 10, - "footer_offsets": { - "end": 2000, - "start": 1000 - }, - "index_id": "my-index", - "node_id": "node", - "num_docs": 12303, - "num_merge_ops": 3, - "partition_id": 7, - "publish_timestamp": 1789, - "source_id": "source", - "split_id": "split", - "split_state": "Published", - "tags": [ - "234", - "aaa" - ], - "time_range": { - "end": 130198, - "start": 121000 - }, - "uncompressed_docs_size_in_bytes": 234234, - "update_timestamp": 1789, - "version": "0.4" - } - ], - "version": "0.4" -} diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-333b645a318ab8f1dac4fd5b5162a638.expected.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-333b645a318ab8f1dac4fd5b5162a638.expected.json index 1fbcfdcd780..0fee081d4fc 100644 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-333b645a318ab8f1dac4fd5b5162a638.expected.json +++ b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.4-333b645a318ab8f1dac4fd5b5162a638.expected.json @@ -96,7 +96,7 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "my-index", "sources": [ @@ -111,10 +111,10 @@ }, "source_id": "kafka-source", "source_type": "kafka", - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" }, "splits": [ { @@ -143,8 +143,8 @@ }, "uncompressed_docs_size_in_bytes": 234234, "update_timestamp": 1789, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-8ee262f0219f8e823ae6cbaf9681548e.expected.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-8ee262f0219f8e823ae6cbaf9681548e.expected.json index 9b2ad0fc782..9458dab0a5d 100644 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-8ee262f0219f8e823ae6cbaf9681548e.expected.json +++ b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-8ee262f0219f8e823ae6cbaf9681548e.expected.json @@ -96,7 +96,7 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "my-index", "sources": [ @@ -114,10 +114,10 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" }, "splits": [ { @@ -146,8 +146,8 @@ }, "uncompressed_docs_size_in_bytes": 234234, "update_timestamp": 1789, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-ae0bbd32511ea50c1edd0519339d63b0.expected.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-ae0bbd32511ea50c1edd0519339d63b0.expected.json deleted file mode 100644 index e0a7233c52d..00000000000 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-ae0bbd32511ea50c1edd0519339d63b0.expected.json +++ /dev/null @@ -1,153 +0,0 @@ -{ - "delete_tasks": [ - { - "create_timestamp": 0, - "delete_query": { - "index_uid": "", - "query_ast": "" - }, - "opstamp": 10 - } - ], - "index": { - "checkpoint": { - "kafka-source": { - "00000000000000000000": "00000000000000000042" - } - }, - "create_timestamp": 1789, - "index_config": { - "doc_mapping": { - "field_mappings": [ - { - "fast": true, - "indexed": true, - "name": "tenant_id", - "stored": true, - "type": "u64" - }, - { - "fast": true, - "indexed": true, - "input_formats": [ - "rfc3339", - "unix_timestamp" - ], - "name": "timestamp", - "output_format": "rfc3339", - "precision": "seconds", - "stored": true, - "type": "datetime" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "log_level", - "stored": true, - "tokenizer": "raw", - "type": "text" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "message", - "record": "position", - "stored": true, - "tokenizer": "default", - "type": "text" - } - ], - "max_num_partitions": 100, - "mode": "dynamic", - "partition_key": "tenant", - "store_source": true, - "tag_fields": [ - "log_level", - "tenant_id" - ], - "timestamp_field": "timestamp" - }, - "index_id": "my-index", - "index_uri": "s3://quickwit-indexes/my-index", - "indexing_settings": { - "commit_timeout_secs": 301, - "docstore_blocksize": 1000000, - "docstore_compression_level": 8, - "merge_policy": { - "maturation_period": "2days", - "max_merge_factor": 11, - "merge_factor": 9, - "min_level_num_docs": 100000, - "type": "stable_log" - }, - "resources": { - "heap_size": 3 - }, - "split_num_docs_target": 10000001 - }, - "retention": { - "period": "90 days", - "schedule": "daily" - }, - "search_settings": { - "default_search_fields": [ - "message" - ] - }, - "version": "0.5" - }, - "index_uid": "my-index", - "sources": [ - { - "desired_num_pipelines": 2, - "enabled": true, - "input_format": "json", - "max_num_pipelines_per_indexer": 2, - "params": { - "client_params": {}, - "topic": "kafka-topic" - }, - "source_id": "kafka-source", - "source_type": "kafka", - "transform": { - "script": ".message = downcase(string!(.message))" - }, - "version": "0.5" - } - ], - "version": "0.5" - }, - "splits": [ - { - "create_timestamp": 3, - "delete_opstamp": 10, - "footer_offsets": { - "end": 2000, - "start": 1000 - }, - "index_uid": "my-index", - "node_id": "node", - "num_docs": 12303, - "num_merge_ops": 3, - "partition_id": 7, - "publish_timestamp": 1789, - "source_id": "source", - "split_id": "split", - "split_state": "Published", - "tags": [ - "234", - "aaa" - ], - "time_range": { - "end": 130198, - "start": 121000 - }, - "uncompressed_docs_size_in_bytes": 234234, - "update_timestamp": 1789, - "version": "0.5" - } - ], - "version": "0.5" -} diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-752a606f501dc5b3c07a79f2d5caecfb.expected.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.6-49108bd130471991dfa55a4918a0d723.expected.json similarity index 97% rename from quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-752a606f501dc5b3c07a79f2d5caecfb.expected.json rename to quickwit/quickwit-metastore/test-data/file-backed-index/v0.6-49108bd130471991dfa55a4918a0d723.expected.json index ce9931b528e..8acc138c322 100644 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-752a606f501dc5b3c07a79f2d5caecfb.expected.json +++ b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.6-49108bd130471991dfa55a4918a0d723.expected.json @@ -96,7 +96,7 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "test:1111111111111", "sources": [ @@ -114,10 +114,10 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" }, "splits": [ { @@ -146,8 +146,8 @@ }, "uncompressed_docs_size_in_bytes": 234234, "update_timestamp": 1789, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-752a606f501dc5b3c07a79f2d5caecfb.json b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.6-49108bd130471991dfa55a4918a0d723.json similarity index 96% rename from quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-752a606f501dc5b3c07a79f2d5caecfb.json rename to quickwit/quickwit-metastore/test-data/file-backed-index/v0.6-49108bd130471991dfa55a4918a0d723.json index 53a7d971a65..8acc138c322 100644 --- a/quickwit/quickwit-metastore/test-data/file-backed-index/v0.5-752a606f501dc5b3c07a79f2d5caecfb.json +++ b/quickwit/quickwit-metastore/test-data/file-backed-index/v0.6-49108bd130471991dfa55a4918a0d723.json @@ -96,13 +96,14 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "test:1111111111111", "sources": [ { "desired_num_pipelines": 2, "enabled": true, + "input_format": "json", "max_num_pipelines_per_indexer": 2, "params": { "client_params": {}, @@ -113,10 +114,10 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" }, "splits": [ { @@ -145,8 +146,8 @@ }, "uncompressed_docs_size_in_bytes": 234234, "update_timestamp": 1789, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-88352b53d5d5b2c92127761d39e17d7a.expected.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-88352b53d5d5b2c92127761d39e17d7a.expected.json index 94b36a91abd..6ac7c0c2761 100644 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-88352b53d5d5b2c92127761d39e17d7a.expected.json +++ b/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-88352b53d5d5b2c92127761d39e17d7a.expected.json @@ -85,7 +85,7 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "my-index", "sources": [ @@ -103,8 +103,8 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-b5e855552221fc7a3d31f4751a9348e3.expected.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-b5e855552221fc7a3d31f4751a9348e3.expected.json deleted file mode 100644 index a88c9771f66..00000000000 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-b5e855552221fc7a3d31f4751a9348e3.expected.json +++ /dev/null @@ -1,107 +0,0 @@ -{ - "checkpoint": { - "kafka-source": { - "00000000000000000000": "00000000000000000042" - } - }, - "create_timestamp": 1789, - "index_config": { - "doc_mapping": { - "field_mappings": [ - { - "fast": true, - "indexed": true, - "name": "tenant_id", - "stored": true, - "type": "u64" - }, - { - "fast": true, - "indexed": true, - "input_formats": [ - "rfc3339", - "unix_timestamp" - ], - "name": "timestamp", - "output_format": "rfc3339", - "precision": "seconds", - "stored": true, - "type": "datetime" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "log_level", - "stored": true, - "tokenizer": "raw", - "type": "text" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "message", - "record": "position", - "stored": true, - "tokenizer": "default", - "type": "text" - } - ], - "max_num_partitions": 100, - "mode": "dynamic", - "partition_key": "tenant", - "store_source": true, - "tag_fields": [ - "log_level", - "tenant_id" - ], - "timestamp_field": "timestamp" - }, - "index_id": "my-index", - "index_uri": "s3://quickwit-indexes/my-index", - "indexing_settings": { - "commit_timeout_secs": 301, - "docstore_blocksize": 1000000, - "docstore_compression_level": 8, - "merge_policy": { - "maturation_period": "2days", - "max_merge_factor": 11, - "merge_factor": 9, - "min_level_num_docs": 100000, - "type": "stable_log" - }, - "resources": { - "heap_size": 3 - }, - "split_num_docs_target": 10000001 - }, - "retention": { - "period": "90 days", - "schedule": "daily" - }, - "search_settings": { - "default_search_fields": [ - "message" - ] - }, - "version": "0.5" - }, - "index_uid": "my-index", - "sources": [ - { - "desired_num_pipelines": 2, - "enabled": true, - "input_format": "json", - "max_num_pipelines_per_indexer": 2, - "params": { - "client_params": {}, - "topic": "kafka-topic" - }, - "source_id": "kafka-source", - "source_type": "kafka", - "version": "0.5" - } - ], - "version": "0.5" -} diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-b5e855552221fc7a3d31f4751a9348e3.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-b5e855552221fc7a3d31f4751a9348e3.json deleted file mode 100644 index 75f09a90f01..00000000000 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.4-b5e855552221fc7a3d31f4751a9348e3.json +++ /dev/null @@ -1,105 +0,0 @@ -{ - "checkpoint": { - "kafka-source": { - "00000000000000000000": "00000000000000000042" - } - }, - "create_timestamp": 1789, - "index_config": { - "doc_mapping": { - "field_mappings": [ - { - "fast": true, - "indexed": true, - "name": "tenant_id", - "stored": true, - "type": "u64" - }, - { - "fast": true, - "indexed": true, - "input_formats": [ - "rfc3339", - "unix_timestamp" - ], - "name": "timestamp", - "output_format": "rfc3339", - "precision": "seconds", - "stored": true, - "type": "datetime" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "log_level", - "stored": true, - "tokenizer": "raw", - "type": "text" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "message", - "record": "position", - "stored": true, - "tokenizer": "default", - "type": "text" - } - ], - "max_num_partitions": 100, - "mode": "dynamic", - "partition_key": "tenant", - "store_source": true, - "tag_fields": [ - "log_level", - "tenant_id" - ], - "timestamp_field": "timestamp" - }, - "index_id": "my-index", - "index_uri": "s3://quickwit-indexes/my-index", - "indexing_settings": { - "commit_timeout_secs": 301, - "docstore_blocksize": 1000000, - "docstore_compression_level": 8, - "merge_policy": { - "maturation_period": "2days", - "max_merge_factor": 11, - "merge_factor": 9, - "min_level_num_docs": 100000, - "type": "stable_log" - }, - "resources": { - "heap_size": 3 - }, - "split_num_docs_target": 10000001 - }, - "retention": { - "period": "90 days", - "schedule": "daily" - }, - "search_settings": { - "default_search_fields": [ - "message" - ] - }, - "version": "0.4" - }, - "sources": [ - { - "desired_num_pipelines": 2, - "enabled": true, - "max_num_pipelines_per_indexer": 2, - "params": { - "client_params": {}, - "topic": "kafka-topic" - }, - "source_id": "kafka-source", - "source_type": "kafka", - "version": "0.4" - } - ], - "version": "0.4" -} diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-1a77cc5755c53213debe38b455a499a5.expected.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-1a77cc5755c53213debe38b455a499a5.expected.json index 94b36a91abd..6ac7c0c2761 100644 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-1a77cc5755c53213debe38b455a499a5.expected.json +++ b/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-1a77cc5755c53213debe38b455a499a5.expected.json @@ -85,7 +85,7 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "my-index", "sources": [ @@ -103,8 +103,8 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-e9835ba0d0caea08198e8d4b14444ea2.expected.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-e9835ba0d0caea08198e8d4b14444ea2.expected.json deleted file mode 100644 index 94b36a91abd..00000000000 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-e9835ba0d0caea08198e8d4b14444ea2.expected.json +++ /dev/null @@ -1,110 +0,0 @@ -{ - "checkpoint": { - "kafka-source": { - "00000000000000000000": "00000000000000000042" - } - }, - "create_timestamp": 1789, - "index_config": { - "doc_mapping": { - "field_mappings": [ - { - "fast": true, - "indexed": true, - "name": "tenant_id", - "stored": true, - "type": "u64" - }, - { - "fast": true, - "indexed": true, - "input_formats": [ - "rfc3339", - "unix_timestamp" - ], - "name": "timestamp", - "output_format": "rfc3339", - "precision": "seconds", - "stored": true, - "type": "datetime" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "log_level", - "stored": true, - "tokenizer": "raw", - "type": "text" - }, - { - "fast": false, - "fieldnorms": false, - "indexed": true, - "name": "message", - "record": "position", - "stored": true, - "tokenizer": "default", - "type": "text" - } - ], - "max_num_partitions": 100, - "mode": "dynamic", - "partition_key": "tenant", - "store_source": true, - "tag_fields": [ - "log_level", - "tenant_id" - ], - "timestamp_field": "timestamp" - }, - "index_id": "my-index", - "index_uri": "s3://quickwit-indexes/my-index", - "indexing_settings": { - "commit_timeout_secs": 301, - "docstore_blocksize": 1000000, - "docstore_compression_level": 8, - "merge_policy": { - "maturation_period": "2days", - "max_merge_factor": 11, - "merge_factor": 9, - "min_level_num_docs": 100000, - "type": "stable_log" - }, - "resources": { - "heap_size": 3 - }, - "split_num_docs_target": 10000001 - }, - "retention": { - "period": "90 days", - "schedule": "daily" - }, - "search_settings": { - "default_search_fields": [ - "message" - ] - }, - "version": "0.5" - }, - "index_uid": "my-index", - "sources": [ - { - "desired_num_pipelines": 2, - "enabled": true, - "input_format": "json", - "max_num_pipelines_per_indexer": 2, - "params": { - "client_params": {}, - "topic": "kafka-topic" - }, - "source_id": "kafka-source", - "source_type": "kafka", - "transform": { - "script": ".message = downcase(string!(.message))" - }, - "version": "0.5" - } - ], - "version": "0.5" -} diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-ef3b95ca1acef59164c3a428bbbc7901.expected.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.6-204e124ad407690da09c9a79100d264f.expected.json similarity index 97% rename from quickwit/quickwit-metastore/test-data/index-metadata/v0.5-ef3b95ca1acef59164c3a428bbbc7901.expected.json rename to quickwit/quickwit-metastore/test-data/index-metadata/v0.6-204e124ad407690da09c9a79100d264f.expected.json index 8257a90491d..cb191642c4c 100644 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-ef3b95ca1acef59164c3a428bbbc7901.expected.json +++ b/quickwit/quickwit-metastore/test-data/index-metadata/v0.6-204e124ad407690da09c9a79100d264f.expected.json @@ -85,7 +85,7 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "test:1111111111111", "sources": [ @@ -103,8 +103,8 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-ef3b95ca1acef59164c3a428bbbc7901.json b/quickwit/quickwit-metastore/test-data/index-metadata/v0.6-204e124ad407690da09c9a79100d264f.json similarity index 96% rename from quickwit/quickwit-metastore/test-data/index-metadata/v0.5-ef3b95ca1acef59164c3a428bbbc7901.json rename to quickwit/quickwit-metastore/test-data/index-metadata/v0.6-204e124ad407690da09c9a79100d264f.json index d73bb54b5c6..cb191642c4c 100644 --- a/quickwit/quickwit-metastore/test-data/index-metadata/v0.5-ef3b95ca1acef59164c3a428bbbc7901.json +++ b/quickwit/quickwit-metastore/test-data/index-metadata/v0.6-204e124ad407690da09c9a79100d264f.json @@ -85,13 +85,14 @@ "message" ] }, - "version": "0.5" + "version": "0.6" }, "index_uid": "test:1111111111111", "sources": [ { "desired_num_pipelines": 2, "enabled": true, + "input_format": "json", "max_num_pipelines_per_indexer": 2, "params": { "client_params": {}, @@ -102,8 +103,8 @@ "transform": { "script": ".message = downcase(string!(.message))" }, - "version": "0.5" + "version": "0.6" } ], - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/split-metadata/v0.4-deef6a97433ed0e2a8e4ac156ff9747c.expected.json b/quickwit/quickwit-metastore/test-data/split-metadata/v0.4-deef6a97433ed0e2a8e4ac156ff9747c.expected.json index 72202d553ec..ed3ce761f71 100644 --- a/quickwit/quickwit-metastore/test-data/split-metadata/v0.4-deef6a97433ed0e2a8e4ac156ff9747c.expected.json +++ b/quickwit/quickwit-metastore/test-data/split-metadata/v0.4-deef6a97433ed0e2a8e4ac156ff9747c.expected.json @@ -21,5 +21,5 @@ "start": 121000 }, "uncompressed_docs_size_in_bytes": 234234, - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-e04c95a4fdba5956a767dd2b03e6d3bf.expected.json b/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-e04c95a4fdba5956a767dd2b03e6d3bf.expected.json index 72202d553ec..ed3ce761f71 100644 --- a/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-e04c95a4fdba5956a767dd2b03e6d3bf.expected.json +++ b/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-e04c95a4fdba5956a767dd2b03e6d3bf.expected.json @@ -21,5 +21,5 @@ "start": 121000 }, "uncompressed_docs_size_in_bytes": 234234, - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-66822ea27f822a91223340448ae7f700.expected.json b/quickwit/quickwit-metastore/test-data/split-metadata/v0.6-97d356533f9650f465db805b726e4f35.expected.json similarity index 95% rename from quickwit/quickwit-metastore/test-data/split-metadata/v0.5-66822ea27f822a91223340448ae7f700.expected.json rename to quickwit/quickwit-metastore/test-data/split-metadata/v0.6-97d356533f9650f465db805b726e4f35.expected.json index 06c1e74dca8..e2aafd98845 100644 --- a/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-66822ea27f822a91223340448ae7f700.expected.json +++ b/quickwit/quickwit-metastore/test-data/split-metadata/v0.6-97d356533f9650f465db805b726e4f35.expected.json @@ -21,5 +21,5 @@ "start": 121000 }, "uncompressed_docs_size_in_bytes": 234234, - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-66822ea27f822a91223340448ae7f700.json b/quickwit/quickwit-metastore/test-data/split-metadata/v0.6-97d356533f9650f465db805b726e4f35.json similarity index 95% rename from quickwit/quickwit-metastore/test-data/split-metadata/v0.5-66822ea27f822a91223340448ae7f700.json rename to quickwit/quickwit-metastore/test-data/split-metadata/v0.6-97d356533f9650f465db805b726e4f35.json index 06c1e74dca8..e2aafd98845 100644 --- a/quickwit/quickwit-metastore/test-data/split-metadata/v0.5-66822ea27f822a91223340448ae7f700.json +++ b/quickwit/quickwit-metastore/test-data/split-metadata/v0.6-97d356533f9650f465db805b726e4f35.json @@ -21,5 +21,5 @@ "start": 121000 }, "uncompressed_docs_size_in_bytes": 234234, - "version": "0.5" + "version": "0.6" } diff --git a/quickwit/quickwit-opentelemetry/Cargo.toml b/quickwit/quickwit-opentelemetry/Cargo.toml index 487439ce196..3e363788f8d 100644 --- a/quickwit/quickwit-opentelemetry/Cargo.toml +++ b/quickwit/quickwit-opentelemetry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-opentelemetry" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-opentelemetry/src/otlp/logs.rs b/quickwit/quickwit-opentelemetry/src/otlp/logs.rs index 35ef609c46b..806b74e00f0 100644 --- a/quickwit/quickwit-opentelemetry/src/otlp/logs.rs +++ b/quickwit/quickwit-opentelemetry/src/otlp/logs.rs @@ -42,7 +42,7 @@ use crate::otlp::metrics::OTLP_SERVICE_METRICS; pub const OTEL_LOGS_INDEX_ID: &str = "otel-logs-v0"; pub const OTEL_LOGS_INDEX_CONFIG: &str = r#" -version: 0.5 +version: 0.6 index_id: otel-logs-v0 diff --git a/quickwit/quickwit-opentelemetry/src/otlp/trace.rs b/quickwit/quickwit-opentelemetry/src/otlp/trace.rs index 94e8b076c4b..67a28177b28 100644 --- a/quickwit/quickwit-opentelemetry/src/otlp/trace.rs +++ b/quickwit/quickwit-opentelemetry/src/otlp/trace.rs @@ -45,7 +45,7 @@ use crate::otlp::{extract_attributes, TraceId}; pub const OTEL_TRACE_INDEX_ID: &str = "otel-trace-v0"; pub const OTEL_TRACE_INDEX_CONFIG: &str = r#" -version: 0.5 +version: 0.6 index_id: otel-trace-v0 diff --git a/quickwit/quickwit-proto/Cargo.toml b/quickwit/quickwit-proto/Cargo.toml index 77f80eadc11..ff04b8a20a6 100644 --- a/quickwit/quickwit-proto/Cargo.toml +++ b/quickwit/quickwit-proto/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-proto" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-query/Cargo.toml b/quickwit/quickwit-query/Cargo.toml index bae860c0bc8..addafc6b67d 100644 --- a/quickwit/quickwit-query/Cargo.toml +++ b/quickwit/quickwit-query/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-query" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-rest-client/Cargo.toml b/quickwit/quickwit-rest-client/Cargo.toml index d5a63ca314d..fa853f06c5b 100644 --- a/quickwit/quickwit-rest-client/Cargo.toml +++ b/quickwit/quickwit-rest-client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-rest-client" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-search/Cargo.toml b/quickwit/quickwit-search/Cargo.toml index 56f21aacc38..305a902b6d1 100644 --- a/quickwit/quickwit-search/Cargo.toml +++ b/quickwit/quickwit-search/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-search" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-serve/Cargo.toml b/quickwit/quickwit-serve/Cargo.toml index 1b6c2e4eadc..5a1d4e8208a 100644 --- a/quickwit/quickwit-serve/Cargo.toml +++ b/quickwit/quickwit-serve/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-serve" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-serve/src/index_api/rest_handler.rs b/quickwit/quickwit-serve/src/index_api/rest_handler.rs index a515e713d1c..3f4a60fa021 100644 --- a/quickwit/quickwit-serve/src/index_api/rest_handler.rs +++ b/quickwit/quickwit-serve/src/index_api/rest_handler.rs @@ -1181,7 +1181,7 @@ mod tests { .path("/indexes?overwrite=true") .method("POST") .json(&true) - .body(r#"{"version": "0.5", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) + .body(r#"{"version": "0.6", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) .reply(&index_management_handler) .await; assert_eq!(resp.status(), 200); @@ -1191,7 +1191,7 @@ mod tests { .path("/indexes?overwrite=true") .method("POST") .json(&true) - .body(r#"{"version": "0.5", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) + .body(r#"{"version": "0.6", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) .reply(&index_management_handler) .await; assert_eq!(resp.status(), 200); @@ -1201,7 +1201,7 @@ mod tests { .path("/indexes") .method("POST") .json(&true) - .body(r#"{"version": "0.5", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) + .body(r#"{"version": "0.6", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) .reply(&index_management_handler) .await; assert_eq!(resp.status(), 400); @@ -1221,7 +1221,7 @@ mod tests { .path("/indexes") .method("POST") .json(&true) - .body(r#"{"version": "0.5", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) + .body(r#"{"version": "0.6", "index_id": "hdfs-logs", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "i64", "fast": true, "indexed": true}]}}"#) .reply(&index_management_handler) .await; assert_eq!(resp.status(), 200); @@ -1235,7 +1235,7 @@ mod tests { assert_json_include!(actual: resp_json, expected: expected_response_json); // Create source. - let source_config_body = r#"{"version": "0.5", "source_id": "vec-source", "source_type": "vec", "params": {"docs": [], "batch_num_docs": 10}}"#; + let source_config_body = r#"{"version": "0.6", "source_id": "vec-source", "source_type": "vec", "params": {"docs": [], "batch_num_docs": 10}}"#; let resp = warp::test::request() .path("/indexes/hdfs-logs/sources") .method("POST") @@ -1326,7 +1326,7 @@ mod tests { let index_management_handler = super::index_management_handlers(Arc::new(index_service), Arc::new(quickwit_config)) .recover(recover_fn); - let source_config_body = r#"{"version": "0.5", "source_id": "file-source", "source_type": "file", "params": {"filepath": "FILEPATH"}}"#; + let source_config_body = r#"{"version": "0.6", "source_id": "file-source", "source_type": "file", "params": {"filepath": "FILEPATH"}}"#; let resp = warp::test::request() .path("/indexes/hdfs-logs/sources") .method("POST") @@ -1354,7 +1354,7 @@ mod tests { .header("content-type", "application/yaml") .body( r#" - version: 0.5 + version: 0.6 index_id: hdfs-logs doc_mapping: field_mappings: @@ -1393,7 +1393,7 @@ mod tests { .header("content-type", "application/toml") .body( r#" - version = "0.5" + version = "0.6" index_id = "hdfs-logs" [doc_mapping] field_mappings = [ @@ -1450,7 +1450,7 @@ mod tests { .method("POST") .json(&true) .body( - r#"{"version": "0.5", "index_id": "hdfs-log", "doc_mapping": + r#"{"version": "0.6", "index_id": "hdfs-log", "doc_mapping": {"field_mappings":[{"name": "timestamp", "type": "unknown", "fast": true, "indexed": true}]}}"#, ) @@ -1490,7 +1490,7 @@ mod tests { .path("/indexes/my-index/sources") .method("POST") .json(&true) - .body(r#"{"version": "0.5", "source_id": "pulsar-source", "desired_num_pipelines": 2, "source_type": "pulsar", "params": {"topics": ["my-topic"], "address": "pulsar://localhost:6650" }}"#) + .body(r#"{"version": "0.6", "source_id": "pulsar-source", "desired_num_pipelines": 2, "source_type": "pulsar", "params": {"topics": ["my-topic"], "address": "pulsar://localhost:6650" }}"#) .reply(&index_management_handler) .await; assert_eq!(resp.status(), 400); diff --git a/quickwit/quickwit-storage/Cargo.toml b/quickwit/quickwit-storage/Cargo.toml index 4e31a397fdf..2407cc3c987 100644 --- a/quickwit/quickwit-storage/Cargo.toml +++ b/quickwit/quickwit-storage/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-storage" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-telemetry/Cargo.toml b/quickwit/quickwit-telemetry/Cargo.toml index ef758687aa1..5b0022abba4 100644 --- a/quickwit/quickwit-telemetry/Cargo.toml +++ b/quickwit/quickwit-telemetry/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "quickwit-telemetry" -version = "0.5.0" +version = "0.6.0" authors = ["Quickwit, Inc. "] edition = "2021" license = "AGPL-3.0-or-later" # For a commercial, license, contact hello@quickwit.io diff --git a/quickwit/quickwit-ui/cypress/integration/homepage.spec.js b/quickwit/quickwit-ui/cypress/integration/homepage.spec.js index a0f73d7ffc5..15779277436 100644 --- a/quickwit/quickwit-ui/cypress/integration/homepage.spec.js +++ b/quickwit/quickwit-ui/cypress/integration/homepage.spec.js @@ -30,6 +30,6 @@ describe('Home navigation', () => { cy.visit('http://127.0.0.1:7280/ui'); cy.get('a').contains('Cluster').click(); cy.get('p').should('contain.text', 'Cluster'); - cy.get('span').should('contain.text', 'seed_addrs'); + cy.get('span').should('contain.text', 'cluster_id'); }); }) diff --git a/quickwit/quickwit-ui/package.json b/quickwit/quickwit-ui/package.json index 635682a76ba..223a851c4e4 100644 --- a/quickwit/quickwit-ui/package.json +++ b/quickwit/quickwit-ui/package.json @@ -1,6 +1,6 @@ { "name": "quickwit-ui", - "version": "0.5.0", + "version": "0.6.0", "license": "AGPL-3.0", "private": true, "proxy": "http://127.0.0.1:7280",