Skip to content

Commit

Permalink
DO NOT MERGE
Browse files Browse the repository at this point in the history
Removed truncate gossip, updated chitchat, removed logging on partial
nodes
  • Loading branch information
fulmicoton committed Feb 20, 2024
1 parent 9bfbae2 commit 185e7e8
Show file tree
Hide file tree
Showing 7 changed files with 192 additions and 192 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/publish_docker_images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ jobs:
include:
- os: ubuntu-latest
platform: linux/amd64
- os: buildjet-4vcpu-ubuntu-2204-arm
platform: linux/arm64
#- os: buildjet-4vcpu-ubuntu-2204-arm
# platform: linux/arm64
runs-on: ${{ matrix.os }}
steps:
- name: Checkout
Expand Down
4 changes: 1 addition & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,7 @@ COPY --from=ui-builder /quickwit/quickwit-ui/build /quickwit/quickwit-ui/build
WORKDIR /quickwit

RUN echo "Building workspace with feature(s) '$CARGO_FEATURES' and profile '$CARGO_PROFILE'" \
&& cargo build \
--features $CARGO_FEATURES \
$(test "$CARGO_PROFILE" = "release" && echo "--release") \
&& cargo build $(test "$CARGO_PROFILE" = "release" && echo "--release") \
&& echo "Copying binaries to /quickwit/bin" \
&& mkdir -p /quickwit/bin \
&& find target/$CARGO_PROFILE -maxdepth 1 -perm /a+x -type f -exec mv {} /quickwit/bin \;
Expand Down
2 changes: 1 addition & 1 deletion quickwit/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

224 changes: 112 additions & 112 deletions quickwit/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,72 +1,72 @@
[workspace]
resolver = "2"
members = [
"quickwit-actors",
"quickwit-aws",
"quickwit-cli",
"quickwit-cluster",
"quickwit-codegen",
"quickwit-codegen/example",
"quickwit-common",
"quickwit-config",
"quickwit-control-plane",
"quickwit-index-management",
"quickwit-datetime",
"quickwit-directories",
"quickwit-doc-mapper",
"quickwit-indexing",
"quickwit-ingest",
"quickwit-integration-tests",
"quickwit-jaeger",
"quickwit-janitor",
"quickwit-lambda",
"quickwit-macros",
"quickwit-metastore",
"quickwit-actors",
"quickwit-aws",
"quickwit-cli",
"quickwit-cluster",
"quickwit-codegen",
"quickwit-codegen/example",
"quickwit-common",
"quickwit-config",
"quickwit-control-plane",
"quickwit-index-management",
"quickwit-datetime",
"quickwit-directories",
"quickwit-doc-mapper",
"quickwit-indexing",
"quickwit-ingest",
"quickwit-integration-tests",
"quickwit-jaeger",
"quickwit-janitor",
"quickwit-lambda",
"quickwit-macros",
"quickwit-metastore",

# Disabling metastore-utils from the quickwit projects to ease build/deps.
# We can reenable it when we need it.
# "quickwit-metastore-utils",
"quickwit-opentelemetry",
"quickwit-proto",
"quickwit-query",
"quickwit-rest-client",
"quickwit-search",
"quickwit-serve",
"quickwit-storage",
"quickwit-telemetry",
# Disabling metastore-utils from the quickwit projects to ease build/deps.
# We can reenable it when we need it.
# "quickwit-metastore-utils",
"quickwit-opentelemetry",
"quickwit-proto",
"quickwit-query",
"quickwit-rest-client",
"quickwit-search",
"quickwit-serve",
"quickwit-storage",
"quickwit-telemetry",
]

# The following list excludes `quickwit-metastore-utils` and `quickwit-lambda`
# from the default member to ease build/deps.
default-members = [
"quickwit-actors",
"quickwit-aws",
"quickwit-cli",
"quickwit-cluster",
"quickwit-codegen",
"quickwit-codegen/example",
"quickwit-common",
"quickwit-config",
"quickwit-control-plane",
"quickwit-datetime",
"quickwit-directories",
"quickwit-doc-mapper",
"quickwit-index-management",
"quickwit-indexing",
"quickwit-ingest",
"quickwit-integration-tests",
"quickwit-jaeger",
"quickwit-janitor",
"quickwit-macros",
"quickwit-metastore",
"quickwit-opentelemetry",
"quickwit-proto",
"quickwit-query",
"quickwit-rest-client",
"quickwit-search",
"quickwit-serve",
"quickwit-storage",
"quickwit-telemetry",
"quickwit-actors",
"quickwit-aws",
"quickwit-cli",
"quickwit-cluster",
"quickwit-codegen",
"quickwit-codegen/example",
"quickwit-common",
"quickwit-config",
"quickwit-control-plane",
"quickwit-datetime",
"quickwit-directories",
"quickwit-doc-mapper",
"quickwit-index-management",
"quickwit-indexing",
"quickwit-ingest",
"quickwit-integration-tests",
"quickwit-jaeger",
"quickwit-janitor",
"quickwit-macros",
"quickwit-metastore",
"quickwit-opentelemetry",
"quickwit-proto",
"quickwit-query",
"quickwit-rest-client",
"quickwit-search",
"quickwit-serve",
"quickwit-storage",
"quickwit-telemetry",
]

[workspace.package]
Expand All @@ -90,10 +90,10 @@ base64 = "0.21"
bytes = { version = "1", features = ["serde"] }
bytesize = { version = "1.3.0", features = ["serde"] }
bytestring = "1.3.0"
chitchat = { git = "https://github.com/quickwit-oss/chitchat.git", rev = "31f8d02" }
chitchat = { git = "https://github.com/quickwit-oss/chitchat.git", rev = "42868769" }
chrono = { version = "0.4", default-features = false, features = [
"clock",
"std",
"clock",
"std",
] }
clap = { version = "4.5.0", features = ["env", "string"] }
colored = "2.1.0"
Expand Down Expand Up @@ -125,12 +125,12 @@ http-serde = "1.1.2"
humansize = "2.1.3"
humantime = "2.1.0"
hyper = { version = "0.14", features = [
"client",
"http1",
"http2",
"server",
"stream",
"tcp",
"client",
"http1",
"http2",
"server",
"stream",
"tcp",
] }
hyper-rustls = "0.24"
indexmap = { version = "2.1.0", features = ["serde"] }
Expand All @@ -142,12 +142,12 @@ lru = "0.12"
lindera-core = "0.27.0"
lindera-dictionary = "0.27.0"
lindera-tokenizer = { version = "0.27.0", features = [
"cc-cedict-compress",
"cc-cedict",
"ipadic-compress",
"ipadic",
"ko-dic-compress",
"ko-dic",
"cc-cedict-compress",
"cc-cedict",
"ipadic-compress",
"ipadic",
"ko-dic-compress",
"ko-dic",
] }
matches = "0.1.9"
md5 = "0.7"
Expand All @@ -169,45 +169,45 @@ percent-encoding = "2.3.1"
pin-project = "1.1.0"
pnet = { version = "0.33.0", features = ["std"] }
postcard = { version = "1.0.4", features = [
"use-std",
"use-std",
], default-features = false }
predicates = "3"
prettyplease = "0.2.0"
proc-macro2 = "1.0.50"
prometheus = { version = "0.13", features = ["process"] }
proptest = "1"
prost = { version = "0.11.6", default-features = false, features = [
"prost-derive",
"prost-derive",
] }
prost-build = "0.11.6"
prost-types = "0.11.6"
pulsar = { git = "https://github.com/quickwit-oss/pulsar-rs.git", rev = "f9eff04", default-features = false, features = [
"auth-oauth2",
"compression",
"tokio-runtime",
"auth-oauth2",
"compression",
"tokio-runtime",
] }
quote = "1.0.23"
rand = "0.8"
rand_distr = "0.4"
rayon = "1"
rdkafka = { version = "0.33", default-features = false, features = [
"cmake-build",
"libz",
"ssl",
"tokio",
"zstd",
"cmake-build",
"libz",
"ssl",
"tokio",
"zstd",
] }
regex = "1.10.0"
regex-syntax = "0.8"
reqwest = { version = "0.11", default-features = false, features = [
"json",
"rustls-tls",
"json",
"rustls-tls",
] }
rust-embed = "6.8.1"
sea-query = { version = "0" }
sea-query-binder = { version = "0", features = [
"runtime-tokio-rustls",
"sqlx-postgres",
"runtime-tokio-rustls",
"sqlx-postgres",
] }
# ^1.0.184 due to serde-rs/serde#2538
serde = { version = "1.0.184", features = ["derive", "rc"] }
Expand All @@ -217,10 +217,10 @@ serde_with = "3.6.0"
serde_yaml = "0.9"
siphasher = "0.3"
sqlx = { version = "0.7", features = [
"migrate",
"postgres",
"runtime-tokio-rustls",
"time",
"migrate",
"postgres",
"runtime-tokio-rustls",
"time",
] }
syn = { version = "2.0.11", features = ["extra-traits", "full", "parsing"] }
sync_wrapper = "0.1.2"
Expand All @@ -239,19 +239,19 @@ toml = "0.7.6"
tonic = { version = "0.9.0", features = ["gzip"] }
tonic-build = "0.9.0"
tower = { version = "0.4.13", features = [
"balance",
"buffer",
"load",
"retry",
"util",
"balance",
"buffer",
"load",
"retry",
"util",
] }
tower-http = { version = "0.4.0", features = ["compression-gzip", "cors"] }
tracing = "0.1.37"
tracing-opentelemetry = "0.20.0"
tracing-subscriber = { version = "0.3.16", features = [
"env-filter",
"std",
"time",
"env-filter",
"std",
"time",
] }
ttl_cache = "0.5"
typetag = "0.2"
Expand All @@ -260,10 +260,10 @@ username = "0.2"
utoipa = "4.2.0"
uuid = { version = "1.7", features = ["v4", "serde"] }
vrl = { version = "0.8.1", default-features = false, features = [
"compiler",
"diagnostic",
"stdlib",
"value",
"compiler",
"diagnostic",
"stdlib",
"value",
] }
warp = "0.3"
whichlang = { git = "https://github.com/quickwit-oss/whichlang", rev = "fe406416" }
Expand All @@ -272,7 +272,7 @@ zstd = "0.13.0"

aws-config = "0.55.0"
aws-credential-types = { version = "0.55.0", features = [
"hardcoded-credentials",
"hardcoded-credentials",
] }
aws-sdk-kinesis = "0.28.0"
aws-sdk-s3 = "0.28.0"
Expand All @@ -284,10 +284,10 @@ aws-types = "0.55.0"

azure_core = { version = "0.13.0", features = ["enable_reqwest_rustls"] }
azure_storage = { version = "0.13.0", default-features = false, features = [
"enable_reqwest_rustls",
"enable_reqwest_rustls",
] }
azure_storage_blobs = { version = "0.13.0", default-features = false, features = [
"enable_reqwest_rustls",
"enable_reqwest_rustls",
] }

opendal = { version = "0.44", default-features = false }
Expand Down Expand Up @@ -323,10 +323,10 @@ quickwit-storage = { path = "quickwit-storage" }
quickwit-telemetry = { path = "quickwit-telemetry" }

tantivy = { git = "https://github.com/quickwit-oss/tantivy/", rev = "1223a87", default-features = false, features = [
"lz4-compression",
"mmap",
"quickwit",
"zstd-compression",
"lz4-compression",
"mmap",
"quickwit",
"zstd-compression",
] }

# This is actually not used directly the goal is to fix the version
Expand Down
Loading

0 comments on commit 185e7e8

Please sign in to comment.