From a6df57e5260e3180e01e1ec58ab81c37eeeda209 Mon Sep 17 00:00:00 2001 From: Przemyslaw Delewski <102958445+pdelewski@users.noreply.github.com> Date: Mon, 13 Jan 2025 17:02:03 +0100 Subject: [PATCH 1/6] Change v2 module name to be standard compliant (#1182) --- quesma/v2/go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/quesma/v2/go.mod b/quesma/v2/go.mod index 91b9405ad..20d01af19 100644 --- a/quesma/v2/go.mod +++ b/quesma/v2/go.mod @@ -1,4 +1,4 @@ -module quesma_v2 +module github.com/QuesmaOrg/quesma/v2 go 1.23.2 From c2bd30adf417646bf9e2f030b2fe6342f05fe2f9 Mon Sep 17 00:00:00 2001 From: Przemyslaw Delewski <102958445+pdelewski@users.noreply.github.com> Date: Tue, 14 Jan 2025 10:05:55 +0100 Subject: [PATCH 2/6] Updating v2 package name (#1183) --- .../clickhouse_backend_connector.go | 2 +- .../elasticsearch_backend_connector.go | 2 +- .../mysql_backend_connector.go | 2 +- .../postgres_backend_connector.go | 2 +- quesma/clickhouse/clickhouse.go | 4 +- quesma/clickhouse/connection.go | 2 +- quesma/clickhouse/quesma_communicator.go | 4 +- quesma/clickhouse/table_discovery.go | 2 +- quesma/common_table/const.go | 2 +- quesma/connectors/connector.go | 2 +- quesma/eql/e2e/query_integration_test.go | 2 +- .../basic_http_frontend_connector.go | 4 +- .../basic_tcp_connection_handler.go | 2 +- .../basic_tcp_connector.go | 2 +- .../elastic_http_frontend_connector.go | 2 +- .../elasticsearch_ingest.go | 2 +- .../elasticsearch_query.go | 2 +- .../passthrough_tcp_connection_handler.go | 2 +- quesma/frontend_connectors/router_v2.go | 8 +- .../tcp_postgres_connection_handler.go | 2 +- quesma/go.mod | 40 +++++----- quesma/go.sum | 74 +++++++++++++++++++ quesma/ingest/common_table_test.go | 2 +- quesma/ingest/ingest_validator_test.go | 2 +- quesma/ingest/insert_test.go | 2 +- quesma/ingest/processor.go | 4 +- quesma/ingest/processor_test.go | 2 +- quesma/logger/logger.go | 2 +- quesma/processors/ab_test_processor.go | 2 +- quesma/processors/base_processor.go | 2 +- quesma/processors/es_to_ch_common/common.go | 2 +- ...icsearch_to_clickhouse_ingest_processor.go | 2 +- ...ticsearch_to_clickhouse_query_processor.go | 4 +- quesma/processors/mysql_ingest_processor.go | 2 +- quesma/processors/mysql_query_processor.go | 2 +- .../processors/postgres_ingest_processor.go | 2 +- quesma/processors/postgres_query_processor.go | 2 +- .../processors/postgres_to_mysql_processor.go | 2 +- quesma/queryparser/query_parser_test.go | 2 +- quesma/quesma/dual_write_proxy.go | 8 +- quesma/quesma/dual_write_proxy_v2.go | 2 +- quesma/quesma/functionality/bulk/bulk.go | 4 +- quesma/quesma/functionality/doc/doc.go | 2 +- .../functionality/terms_enum/terms_enum.go | 4 +- .../terms_enum/terms_enum_test.go | 4 +- quesma/quesma/matchers.go | 4 +- quesma/quesma/matchers_test.go | 2 +- quesma/quesma/quesma.go | 2 +- quesma/quesma/route_handlers.go | 4 +- quesma/quesma/router.go | 6 +- quesma/quesma/router_test.go | 4 +- quesma/quesma/router_v2.go | 4 +- quesma/quesma/search.go | 6 +- quesma/quesma/search_ab_testing.go | 6 +- quesma/quesma/search_common_table_test.go | 4 +- quesma/quesma/search_norace_test.go | 2 +- quesma/quesma/search_test.go | 2 +- quesma/quesma/types/request_body.go | 2 +- quesma/quesma/ui/html_pages_test.go | 2 +- quesma/quesma/ui/live_tail.go | 2 +- quesma/quesma/ui/live_tail_drilldown.go | 4 +- quesma/quesma/ui/management_console.go | 2 +- quesma/quesma/ui/routing.go | 2 +- quesma/quesma/v2_test.go | 2 +- quesma/quesma/v2_test_objects.go | 2 +- quesma/stats/errorstats/error_statistics.go | 2 +- quesma/table_resolver/empty.go | 2 +- quesma/table_resolver/model.go | 2 +- quesma/table_resolver/rules.go | 2 +- quesma/table_resolver/table_resolver.go | 2 +- quesma/table_resolver/table_resolver_dummy.go | 2 +- quesma/table_resolver/table_resolver_test.go | 2 +- quesma/telemetry/duration.go | 2 +- quesma/telemetry/multi_counter.go | 2 +- quesma/telemetry/phone_home.go | 4 +- quesma/tracing/async_trace_logger.go | 2 +- quesma/tracing/async_trace_logger_test.go | 2 +- quesma/v2/core/dependency_injection.go | 2 +- quesma/v2/core/dependency_injection_test.go | 2 +- quesma/v2/core/match_history.go | 2 +- quesma/v2/core/quesma_logger.go | 2 +- quesma/v2/core/request_processors.go | 2 +- quesma/v2_quesma_builder.go | 2 +- 83 files changed, 202 insertions(+), 128 deletions(-) diff --git a/quesma/backend_connectors/clickhouse_backend_connector.go b/quesma/backend_connectors/clickhouse_backend_connector.go index 7a9e3c0ea..7183c1829 100644 --- a/quesma/backend_connectors/clickhouse_backend_connector.go +++ b/quesma/backend_connectors/clickhouse_backend_connector.go @@ -8,7 +8,7 @@ import ( "database/sql" "github.com/ClickHouse/clickhouse-go/v2" - quesma_api "quesma_v2/core" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" ) type ClickHouseBackendConnector struct { diff --git a/quesma/backend_connectors/elasticsearch_backend_connector.go b/quesma/backend_connectors/elasticsearch_backend_connector.go index 439267f95..a742344b6 100644 --- a/quesma/backend_connectors/elasticsearch_backend_connector.go +++ b/quesma/backend_connectors/elasticsearch_backend_connector.go @@ -10,8 +10,8 @@ import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net/http" - quesma_api "quesma_v2/core" "time" ) diff --git a/quesma/backend_connectors/mysql_backend_connector.go b/quesma/backend_connectors/mysql_backend_connector.go index d54d5d9c7..45e1eb7c9 100644 --- a/quesma/backend_connectors/mysql_backend_connector.go +++ b/quesma/backend_connectors/mysql_backend_connector.go @@ -6,8 +6,8 @@ package backend_connectors import ( "context" "database/sql" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" _ "github.com/go-sql-driver/mysql" - quesma_api "quesma_v2/core" ) type MySqlRows struct { diff --git a/quesma/backend_connectors/postgres_backend_connector.go b/quesma/backend_connectors/postgres_backend_connector.go index 0b5f7e6c5..9877affc2 100644 --- a/quesma/backend_connectors/postgres_backend_connector.go +++ b/quesma/backend_connectors/postgres_backend_connector.go @@ -5,8 +5,8 @@ package backend_connectors import ( "context" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/jackc/pgx/v4" - quesma_api "quesma_v2/core" ) type PostgresBackendConnector struct { diff --git a/quesma/clickhouse/clickhouse.go b/quesma/clickhouse/clickhouse.go index 822be0808..dfef6bb64 100644 --- a/quesma/clickhouse/clickhouse.go +++ b/quesma/clickhouse/clickhouse.go @@ -13,8 +13,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_api "quesma_v2/core" - "quesma_v2/core/diag" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" "slices" "strings" "sync/atomic" diff --git a/quesma/clickhouse/connection.go b/quesma/clickhouse/connection.go index 9b3bfb5de..becf9cf49 100644 --- a/quesma/clickhouse/connection.go +++ b/quesma/clickhouse/connection.go @@ -11,8 +11,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/buildinfo" "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net" - quesma_api "quesma_v2/core" "strings" "time" ) diff --git a/quesma/clickhouse/quesma_communicator.go b/quesma/clickhouse/quesma_communicator.go index 3da183f51..035a043aa 100644 --- a/quesma/clickhouse/quesma_communicator.go +++ b/quesma/clickhouse/quesma_communicator.go @@ -10,9 +10,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/model" "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "math/rand" - quesma_api "quesma_v2/core" - tracing "quesma_v2/core/tracing" "strconv" "strings" "sync/atomic" diff --git a/quesma/clickhouse/table_discovery.go b/quesma/clickhouse/table_discovery.go index 0970f7ada..dd05c3206 100644 --- a/quesma/clickhouse/table_discovery.go +++ b/quesma/clickhouse/table_discovery.go @@ -13,8 +13,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/goccy/go-json" - quesma_api "quesma_v2/core" "strings" "sync/atomic" "time" diff --git a/quesma/common_table/const.go b/quesma/common_table/const.go index 05206f3be..fc070ea8d 100644 --- a/quesma/common_table/const.go +++ b/quesma/common_table/const.go @@ -5,7 +5,7 @@ package common_table import ( "context" "github.com/QuesmaOrg/quesma/quesma/logger" - quesma_api "quesma_v2/core" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" ) const TableName = "quesma_common_table" diff --git a/quesma/connectors/connector.go b/quesma/connectors/connector.go index e786b7ffe..17453e71e 100644 --- a/quesma/connectors/connector.go +++ b/quesma/connectors/connector.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/telemetry" - quesma_api "quesma_v2/core" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" ) type Connector interface { diff --git a/quesma/eql/e2e/query_integration_test.go b/quesma/eql/e2e/query_integration_test.go index d2d857930..0bfdf51e8 100644 --- a/quesma/eql/e2e/query_integration_test.go +++ b/quesma/eql/e2e/query_integration_test.go @@ -7,10 +7,10 @@ package e2e import ( "bytes" "fmt" + "github.com/QuesmaOrg/quesma/quesma/jsonprocessor" "github.com/goccy/go-json" "io" "net/http" - "quesma/jsonprocessor" "sort" "strings" ) diff --git a/quesma/frontend_connectors/basic_http_frontend_connector.go b/quesma/frontend_connectors/basic_http_frontend_connector.go index 39e84d7e1..b455f400c 100644 --- a/quesma/frontend_connectors/basic_http_frontend_connector.go +++ b/quesma/frontend_connectors/basic_http_frontend_connector.go @@ -9,10 +9,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/schema" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" "io" "net/http" - quesma_api "quesma_v2/core" - "quesma_v2/core/diag" "sync" ) diff --git a/quesma/frontend_connectors/basic_tcp_connection_handler.go b/quesma/frontend_connectors/basic_tcp_connection_handler.go index 126a7511d..e5aaf0eeb 100644 --- a/quesma/frontend_connectors/basic_tcp_connection_handler.go +++ b/quesma/frontend_connectors/basic_tcp_connection_handler.go @@ -5,9 +5,9 @@ package frontend_connectors import ( "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "io" "net" - quesma_api "quesma_v2/core" ) type BasicTcpConnectionHandler struct { diff --git a/quesma/frontend_connectors/basic_tcp_connector.go b/quesma/frontend_connectors/basic_tcp_connector.go index e97fdd9a7..52b7bf7eb 100644 --- a/quesma/frontend_connectors/basic_tcp_connector.go +++ b/quesma/frontend_connectors/basic_tcp_connector.go @@ -6,8 +6,8 @@ package frontend_connectors import ( "context" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net" - quesma_api "quesma_v2/core" "sync/atomic" ) diff --git a/quesma/frontend_connectors/elastic_http_frontend_connector.go b/quesma/frontend_connectors/elastic_http_frontend_connector.go index f1aaa7ac1..b596c7cd8 100644 --- a/quesma/frontend_connectors/elastic_http_frontend_connector.go +++ b/quesma/frontend_connectors/elastic_http_frontend_connector.go @@ -8,8 +8,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/schema" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net/http" - quesma_api "quesma_v2/core" ) type ElasticHttpIngestFrontendConnector struct { diff --git a/quesma/frontend_connectors/elasticsearch_ingest.go b/quesma/frontend_connectors/elasticsearch_ingest.go index 737bf5e4e..a104a53d8 100644 --- a/quesma/frontend_connectors/elasticsearch_ingest.go +++ b/quesma/frontend_connectors/elasticsearch_ingest.go @@ -6,8 +6,8 @@ package frontend_connectors import ( "context" "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_common" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net/http" - quesma_api "quesma_v2/core" ) type ElasticsearchIngestFrontendConnector struct { diff --git a/quesma/frontend_connectors/elasticsearch_query.go b/quesma/frontend_connectors/elasticsearch_query.go index 1577c0002..2f194e5a5 100644 --- a/quesma/frontend_connectors/elasticsearch_query.go +++ b/quesma/frontend_connectors/elasticsearch_query.go @@ -8,8 +8,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_common" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net/http" - quesma_api "quesma_v2/core" ) type ElasticsearchQueryFrontendConnector struct { diff --git a/quesma/frontend_connectors/passthrough_tcp_connection_handler.go b/quesma/frontend_connectors/passthrough_tcp_connection_handler.go index 2ce2e80d8..6594e3752 100644 --- a/quesma/frontend_connectors/passthrough_tcp_connection_handler.go +++ b/quesma/frontend_connectors/passthrough_tcp_connection_handler.go @@ -5,9 +5,9 @@ package frontend_connectors import ( "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "io" "net" - quesma_api "quesma_v2/core" ) func (p *PassThroughConnectionHandler) copyData(src io.Reader, dest io.Writer) { diff --git a/quesma/frontend_connectors/router_v2.go b/quesma/frontend_connectors/router_v2.go index 2588622cf..2c10a2f73 100644 --- a/quesma/frontend_connectors/router_v2.go +++ b/quesma/frontend_connectors/router_v2.go @@ -22,12 +22,12 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/ui" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "io" "net/http" - quesma_api "quesma_v2/core" - "quesma_v2/core/diag" - "quesma_v2/core/routes" - "quesma_v2/core/tracing" "strings" "sync/atomic" "time" diff --git a/quesma/frontend_connectors/tcp_postgres_connection_handler.go b/quesma/frontend_connectors/tcp_postgres_connection_handler.go index 8cf968017..eb3ef9e7b 100644 --- a/quesma/frontend_connectors/tcp_postgres_connection_handler.go +++ b/quesma/frontend_connectors/tcp_postgres_connection_handler.go @@ -5,9 +5,9 @@ package frontend_connectors import ( "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/jackc/pgx/v5/pgproto3" "net" - quesma_api "quesma_v2/core" ) type TcpPostgresConnectionHandler struct { diff --git a/quesma/go.mod b/quesma/go.mod index 6d54d61b9..8bb3dd2ab 100644 --- a/quesma/go.mod +++ b/quesma/go.mod @@ -2,13 +2,14 @@ module github.com/QuesmaOrg/quesma/quesma go 1.23.2 -replace quesma_v2 => ./v2 +replace github.com/QuesmaOrg/quesma/v2 => ./v2 require ( github.com/ClickHouse/clickhouse-go/v2 v2.30.0 github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/DataDog/go-sqllexer v0.0.20 github.com/H0llyW00dzZ/cidr v1.2.1 + github.com/QuesmaOrg/quesma/v2 v2.0.0-00010101000000-000000000000 github.com/apparentlymart/go-cidr v1.1.0 github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df github.com/coreos/go-semver v0.3.1 @@ -32,25 +33,24 @@ require ( github.com/rs/zerolog v1.33.0 github.com/shirou/gopsutil/v3 v3.24.5 github.com/stretchr/testify v1.10.0 - github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a + github.com/tailscale/hujson v0.0.0-20241010212012-29efb4a0184b github.com/tidwall/sjson v1.2.5 github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb - golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f - golang.org/x/oauth2 v0.24.0 - quesma_v2 v0.0.0-00010101000000-000000000000 + golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 + golang.org/x/oauth2 v0.25.0 ) require ( filippo.io/edwards25519 v1.1.0 // indirect github.com/go-viper/mapstructure/v2 v2.2.1 // indirect - github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/hashicorp/errwrap v1.1.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.14.3 // indirect github.com/jackc/pgio v1.0.0 // indirect github.com/jackc/pgpassfile v1.0.0 // indirect github.com/jackc/pgproto3/v2 v2.3.3 // indirect github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect - github.com/jackc/pgtype v1.14.0 // indirect + github.com/jackc/pgtype v1.14.4 // indirect github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 // indirect github.com/knadh/koanf/maps v0.1.1 // indirect github.com/kr/text v0.2.0 // indirect @@ -59,35 +59,35 @@ require ( github.com/tidwall/gjson v1.18.0 // indirect github.com/tidwall/match v1.1.1 // indirect github.com/tidwall/pretty v1.2.1 // indirect - golang.org/x/crypto v0.31.0 // indirect + golang.org/x/crypto v0.32.0 // indirect golang.org/x/text v0.21.0 // indirect ) require ( - github.com/ClickHouse/ch-go v0.61.5 // indirect + github.com/ClickHouse/ch-go v0.63.1 // indirect github.com/andybalholm/brotli v1.1.1 // indirect github.com/antlr4-go/antlr/v4 v4.13.1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect - github.com/fsnotify/fsnotify v1.7.0 // indirect + github.com/fsnotify/fsnotify v1.8.0 // indirect github.com/go-faster/city v1.0.1 // indirect github.com/go-faster/errors v0.7.1 // indirect - github.com/go-ole/go-ole v1.2.6 // indirect + github.com/go-ole/go-ole v1.3.0 // indirect github.com/klauspost/compress v1.17.11 - github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect + github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 // indirect + github.com/mattn/go-colorable v0.1.14 // indirect github.com/mattn/go-isatty v0.0.20 // indirect github.com/paulmach/orb v0.11.1 // indirect - github.com/pierrec/lz4/v4 v4.1.21 // indirect + github.com/pierrec/lz4/v4 v4.1.22 // indirect github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect - github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 // indirect github.com/segmentio/asm v1.2.0 // indirect github.com/shoenig/go-m1cpu v0.1.6 // indirect github.com/shopspring/decimal v1.4.0 // indirect - github.com/tklauser/go-sysconf v0.3.12 // indirect - github.com/tklauser/numcpus v0.6.1 // indirect + github.com/tklauser/go-sysconf v0.3.14 // indirect + github.com/tklauser/numcpus v0.9.0 // indirect github.com/yusufpapurcu/wmi v1.2.4 // indirect - go.opentelemetry.io/otel v1.28.0 // indirect - go.opentelemetry.io/otel/trace v1.28.0 // indirect - golang.org/x/sys v0.28.0 // indirect + go.opentelemetry.io/otel v1.33.0 // indirect + go.opentelemetry.io/otel/trace v1.33.0 // indirect + golang.org/x/sys v0.29.0 // indirect gopkg.in/yaml.v3 v3.0.1 ) diff --git a/quesma/go.sum b/quesma/go.sum index 3924450f7..2e779a0e8 100644 --- a/quesma/go.sum +++ b/quesma/go.sum @@ -3,6 +3,9 @@ filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/ClickHouse/ch-go v0.61.5 h1:zwR8QbYI0tsMiEcze/uIMK+Tz1D3XZXLdNrlaOpeEI4= github.com/ClickHouse/ch-go v0.61.5/go.mod h1:s1LJW/F/LcFs5HJnuogFMta50kKDO0lf9zzfrbl0RQg= +github.com/ClickHouse/ch-go v0.63.1 h1:s2JyZvWLTCSAGdtjMBBmAgQQHMco6pawLJMOXi0FODM= +github.com/ClickHouse/ch-go v0.63.1/go.mod h1:I1kJJCL3WJcBMGe1m+HVK0+nREaG+JOYYBWjrDrF3R0= +github.com/ClickHouse/clickhouse-go v1.5.4 h1:cKjXeYLNWVJIx2J1K6H2CqyRmfwVJVY1OV1coaaFcI0= github.com/ClickHouse/clickhouse-go/v2 v2.30.0 h1:AG4D/hW39qa58+JHQIFOSnxyL46H6h2lrmGGk17dhFo= github.com/ClickHouse/clickhouse-go/v2 v2.30.0/go.mod h1:i9ZQAojcayW3RsdCb3YR+n+wC2h65eJsZCscZ1Z1wyo= github.com/DATA-DOG/go-sqlmock v1.5.2 h1:OcvFkGmslmlZibjAjaHm3L//6LiuBgolP7OputlJIzU= @@ -35,6 +38,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA= github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= +github.com/fsnotify/fsnotify v1.8.0 h1:dAwr6QBTBZIkG8roQaJjGof0pp0EeF+tNV7YBP3F/8M= +github.com/fsnotify/fsnotify v1.8.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0= github.com/go-faster/city v1.0.1 h1:4WAxSZ3V2Ws4QRDrscLEDcibJY8uf41H6AhXDrNDcGw= github.com/go-faster/city v1.0.1/go.mod h1:jKcUJId49qdW3L1qKHH/3wPeUstCVpVSXTM6vO3VcTw= github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg= @@ -43,6 +48,8 @@ github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vb github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-ole/go-ole v1.3.0 h1:Dt6ye7+vXGIKZ7Xtk4s6/xVdGDQynvom7xCFEdWr6uE= +github.com/go-ole/go-ole v1.3.0/go.mod h1:5LS6F96DhAwUc7C+1HLexzMXY1xGRSryjyPPKW6zv78= github.com/go-sql-driver/mysql v1.8.1 h1:LedoTUt/eveggdHS9qUFC1EFSa8bU2+1pZjSRpvNJ1Y= github.com/go-sql-driver/mysql v1.8.1/go.mod h1:wEBSXgmK//2ZFJyE+qWnIsVGmvmEKlqwuVSjsCm7DZg= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= @@ -74,8 +81,11 @@ github.com/gorilla/sessions v1.4.0 h1:kpIYOp/oi6MG/p5PgxApU8srsSw9tuFbt46Lt7auzq github.com/gorilla/sessions v1.4.0/go.mod h1:FLWm50oby91+hl7p/wRxDth9bWSuk0qVL2emc7lT5ik= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I= +github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo= github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM= +github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -96,6 +106,7 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= @@ -106,6 +117,7 @@ github.com/jackc/pgproto3/v2 v2.1.1/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwX github.com/jackc/pgproto3/v2 v2.3.3 h1:1HLSx5H+tXR9pW3in3zaztoEwQYRC9SQaYUHjTSUOag= github.com/jackc/pgproto3/v2 v2.3.3/go.mod h1:WfJCnwN3HIg9Ish/j3sgWXnAfK8A9Y0bwXYU5xKaEdA= github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b/go.mod h1:vsD4gTJCa9TptPL8sPkXrLZ+hDuNrZCnj29CQpr4X1E= +github.com/jackc/pgservicefile v0.0.0-20221227161230-091c0ba34f0a/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= github.com/jackc/pgtype v0.0.0-20190421001408-4ed0de4755e0/go.mod h1:hdSHsc1V01CGwFsrv11mJRHWJ6aifDLfdV3aVjFF0zg= @@ -114,10 +126,13 @@ github.com/jackc/pgtype v0.0.0-20190828014616-a8802b16cc59/go.mod h1:MWlu30kVJrU github.com/jackc/pgtype v1.8.1-0.20210724151600-32e20a603178/go.mod h1:C516IlIV9NKqfsMCXTdChteoXmwgUceqaLfjg2e3NlM= github.com/jackc/pgtype v1.14.0 h1:y+xUdabmyMkJLyApYuPj38mW+aAIqCe5uuBB51rH3Vw= github.com/jackc/pgtype v1.14.0/go.mod h1:LUMuVrfsFfdKGLw+AFFVv6KtHOFMwRgDDzBt76IqCA4= +github.com/jackc/pgtype v1.14.4 h1:fKuNiCumbKTAIxQwXfB/nsrnkEI6bPJrrSiMKgbJ2j8= +github.com/jackc/pgtype v1.14.4/go.mod h1:aKeozOde08iifGosdJpz9MBZonJOUJxqNpPBcMJTlVA= github.com/jackc/pgx/v4 v4.0.0-20190420224344-cc3461e65d96/go.mod h1:mdxmSJJuR08CZQyj1PVQBHy9XOp5p8/SHH6a0psbY9Y= github.com/jackc/pgx/v4 v4.0.0-20190421002000-1b8f0016e912/go.mod h1:no/Y67Jkk/9WuGR0JG/JseM9irFbnEPbuWV2EELPNuM= github.com/jackc/pgx/v4 v4.0.0-pre1.0.20190824185557-6972a5742186/go.mod h1:X+GQnOEnf1dqHGpw7JmHqHc1NxDoalibchSk9/RWuDc= github.com/jackc/pgx/v4 v4.12.1-0.20210724153913-640aa07df17c/go.mod h1:1QD0+tgSXP7iUjYm9C1NxKhny7lq6ee99u/z+IHFcgs= +github.com/jackc/pgx/v4 v4.18.2/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/pgx/v4 v4.18.3 h1:dE2/TrEsGX3RBprb3qryqSV9Y60iZN1C6i8IrmW9/BA= github.com/jackc/pgx/v4 v4.18.3/go.mod h1:Ey4Oru5tH5sB6tV7hDmfWFahwF15Eb7DNXlRKx2CkVw= github.com/jackc/pgx/v5 v5.7.2 h1:mLoDLV6sonKlvjIEsV56SkWNCnuNv531l94GaIzO+XI= @@ -125,6 +140,7 @@ github.com/jackc/pgx/v5 v5.7.2/go.mod h1:ncY89UGWxg82EykZUwSpUKEfccBGGYq1xjrOpsb github.com/jackc/puddle v0.0.0-20190413234325-e4ced69a3a2b/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= +github.com/jackc/puddle v1.3.0/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88 h1:uC1QfSlInpQF+M0ao65imhwqKnz3Q2z/d8PWZRMQvDM= github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= github.com/k0kubun/pp v3.0.1+incompatible h1:3tqvf7QgUnZ5tXO6pNAZlrvHgl6DvifjDrd9g2S9Z40= @@ -162,12 +178,16 @@ github.com/lib/pq v1.10.2 h1:AqzbZs4ZoCBp+GtejcpCpcxM3zlSMx29dXbUSeVtJb8= github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683 h1:7UMa6KCCMjZEMDtTVdcGu0B1GmmC7QJKiCCjyTAWQy0= +github.com/lufia/plan9stats v0.0.0-20240909124753-873cd0166683/go.mod h1:ilwx/Dta8jXAgpFYFvSWEMwxmbWXyiUHkd5FwyKhb5k= github.com/markbates/goth v1.80.0 h1:NnvatczZDzOs1hn9Ug+dVYf2Viwwkp/ZDX5K+GLjan8= github.com/markbates/goth v1.80.0/go.mod h1:4/GYHo+W6NWisrMPZnq0Yr2Q70UntNLn7KXEFhrIdAY= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= +github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE= +github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= @@ -185,6 +205,8 @@ github.com/paulmach/orb v0.11.1/go.mod h1:5mULz1xQfs3bmQm63QEJA6lNGujuRafwA5S/En github.com/paulmach/protoscan v0.2.1/go.mod h1:SpcSwydNLrxUGSDvXvO0P7g7AuhJ7lcKfDlhJCDw2gY= github.com/pierrec/lz4/v4 v4.1.21 h1:yOVMLb6qSIDP67pl/5F7RepeKYu/VmTyEXvuMI5d9mQ= github.com/pierrec/lz4/v4 v4.1.21/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= +github.com/pierrec/lz4/v4 v4.1.22 h1:cKFw6uJDK+/gfw5BcDL0JL5aBsAFdsIT18eRtLj7VIU= +github.com/pierrec/lz4/v4 v4.1.22/go.mod h1:gZWDp/Ze/IJXGXf23ltt2EXimqmTUXEy0GFuRQyBid4= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= @@ -193,6 +215,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55 h1:o4JXh1EVt9k/+g42oCprj/FisM4qX9L3sZB3upGN2ZU= +github.com/power-devops/perfstat v0.0.0-20240221224432-82ca36839d55/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= @@ -205,6 +229,7 @@ github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWR github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys= github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs= +github.com/shirou/gopsutil v3.21.11+incompatible h1:+1+c1VGhc88SSonWP6foOcLhvnKlUeu/erjjvaPEYiI= github.com/shirou/gopsutil/v3 v3.24.5 h1:i0t8kL+kQTvpAYToeuiVk3TgDeKOFioZO3Ztz/iZ9pI= github.com/shirou/gopsutil/v3 v3.24.5/go.mod h1:bsoOS1aStSs9ErQ1WWfxllSeS1K5D+U30r2NfcubMVk= github.com/shoenig/go-m1cpu v0.1.6 h1:nxdKQNcEB6vzgA2E2bvzKIYRuNj7XNJ4S/aRSwKzFtM= @@ -220,16 +245,23 @@ github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6Mwd github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a h1:SJy1Pu0eH1C29XwJucQo73FrleVK6t4kYz4NVhp34Yw= github.com/tailscale/hujson v0.0.0-20221223112325-20486734a56a/go.mod h1:DFSS3NAGHthKo1gTlmEcSBiZrRJXi28rLNd/1udP1c8= +github.com/tailscale/hujson v0.0.0-20241010212012-29efb4a0184b h1:MNaGusDfB1qxEsl6iVb33Gbe777IKzPP5PDta0xGC8M= +github.com/tailscale/hujson v0.0.0-20241010212012-29efb4a0184b/go.mod h1:EbW0wDK/qEUYI0A5bqq0C2kF8JTQwWONmGDBbzsxxHo= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY= github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= @@ -243,8 +275,12 @@ github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY= github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28= github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU= github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI= +github.com/tklauser/go-sysconf v0.3.14 h1:g5vzr9iPFFz24v2KZXs/pvpvh8/V9Fw6vQK5ZZb78yU= +github.com/tklauser/go-sysconf v0.3.14/go.mod h1:1ym4lWMLUOhuBOPGtRcJm7tEGX4SCYNEEEtghGG/8uY= github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk= github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY= +github.com/tklauser/numcpus v0.9.0 h1:lmyCHtANi8aRUgkckBgoDk1nHCux3n2cgkJLXdQGPDo= +github.com/tklauser/numcpus v0.9.0/go.mod h1:SN6Nq1O3VychhC1npsWostA+oW+VOQTxZrS604NSRyI= github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb h1:Ywfo8sUltxogBpFuMOFRrrSifO788kAFxmvVw31PtQQ= github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb/go.mod h1:ikPs9bRWicNw3S7XpJ8sK/smGwU9WcSVU3dy9qahYBM= github.com/xdg-go/pbkdf2 v1.0.0/go.mod h1:jrpuAogTd400dnrH08LKmI/xc1MbPOebTwRqcT5RDeI= @@ -255,14 +291,19 @@ github.com/xyproto/randomstring v1.0.5/go.mod h1:rgmS5DeNXLivK7YprL0pY+lTuhNQW3i github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0= github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.mongodb.org/mongo-driver v1.11.4/go.mod h1:PTSz5yu21bkT/wXpkS7WR5f0ddqw5quethTUn9WM+2g= go.opentelemetry.io/otel v1.28.0 h1:/SqNcYk+idO0CxKEUOtKQClMK/MimZihKYMruSMViUo= go.opentelemetry.io/otel v1.28.0/go.mod h1:q68ijF8Fc8CnMHKyzqL6akLO46ePnjkgfIMIjUIX9z4= +go.opentelemetry.io/otel v1.33.0 h1:/FerN9bax5LoK51X/sI0SVYrjSE0/yUL7DpxW4K3FWw= +go.opentelemetry.io/otel v1.33.0/go.mod h1:SUUkR6csvUQl+yjReHu5uM3EtVV7MBm5FHKRlNx4I8I= go.opentelemetry.io/otel/trace v1.28.0 h1:GhQ9cUuQGmNDd5BTCP2dAvv75RdMxEfTmYejp+lkx9g= go.opentelemetry.io/otel/trace v1.28.0/go.mod h1:jPyXzNPg6da9+38HEwElrQiHlVMTnVfM3/yv2OlIHaI= +go.opentelemetry.io/otel/trace v1.33.0 h1:cCJuF7LRjUFso9LPnEAHJDB2pqzp+hbO8eu1qqW2d/s= +go.opentelemetry.io/otel/trace v1.33.0/go.mod h1:uIcdVUZMpTAmz0tI1z04GoVSezK37CbGV4fr1f2nBck= go.uber.org/atomic v1.3.2/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= go.uber.org/atomic v1.5.0/go.mod h1:sABNBOSYdrvTF6hTgEIbc7YasKWGhgEQZyfxyTvoXHQ= @@ -283,16 +324,25 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU= +golang.org/x/crypto v0.20.0/go.mod h1:Xwo95rrVNIoSMx9wa1JroENMToLWn3RNVrTBpLHgZPQ= golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc= +golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f h1:XdNn9LlyWAhLVp6P/i8QYBW+hlyhrhei9uErw2B5GJo= golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f/go.mod h1:D5SMRVC3C2/4+F/DB1wZsLRnSNimn2Sp/NPsCrsv8ak= +golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 h1:yqrTHse8TCMW1M1ZCP+VAR/l0kKxwaAIqN/il7x4voA= +golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU= golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= @@ -301,12 +351,20 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= +golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44= golang.org/x/oauth2 v0.24.0 h1:KTBBxWqUa0ykRPLtV69rRto9TLXcqYkeswu48x/gvNE= golang.org/x/oauth2 v0.24.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= +golang.org/x/oauth2 v0.25.0 h1:CY4y7XT9v0cRI9oupztF8AgiIu99L/ksR/Xp/6jrZ70= +golang.org/x/oauth2 v0.25.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -323,21 +381,35 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU= +golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo= +golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -351,6 +423,8 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.0.0-20200103221440-774c71fcf114/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190410155217-1f06c39b4373/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= diff --git a/quesma/ingest/common_table_test.go b/quesma/ingest/common_table_test.go index 12466f04b..996cbf348 100644 --- a/quesma/ingest/common_table_test.go +++ b/quesma/ingest/common_table_test.go @@ -14,9 +14,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" + mux "github.com/QuesmaOrg/quesma/v2/core" "github.com/goccy/go-json" "github.com/stretchr/testify/assert" - mux "quesma_v2/core" "testing" ) diff --git a/quesma/ingest/ingest_validator_test.go b/quesma/ingest/ingest_validator_test.go index b7d35b8f7..a8925bb8d 100644 --- a/quesma/ingest/ingest_validator_test.go +++ b/quesma/ingest/ingest_validator_test.go @@ -13,8 +13,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + mux "github.com/QuesmaOrg/quesma/v2/core" "github.com/stretchr/testify/assert" - mux "quesma_v2/core" "strings" "testing" ) diff --git a/quesma/ingest/insert_test.go b/quesma/ingest/insert_test.go index 7a21f35f5..17a4c5eb1 100644 --- a/quesma/ingest/insert_test.go +++ b/quesma/ingest/insert_test.go @@ -15,8 +15,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + mux "github.com/QuesmaOrg/quesma/v2/core" "github.com/stretchr/testify/assert" - mux "quesma_v2/core" "slices" "strconv" "strings" diff --git a/quesma/ingest/processor.go b/quesma/ingest/processor.go index 311074dfc..4db1a0f5e 100644 --- a/quesma/ingest/processor.go +++ b/quesma/ingest/processor.go @@ -23,9 +23,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" "github.com/goccy/go-json" - "quesma_v2/core" - "quesma_v2/core/diag" "slices" "sort" "strings" diff --git a/quesma/ingest/processor_test.go b/quesma/ingest/processor_test.go index ecdab5099..a78053913 100644 --- a/quesma/ingest/processor_test.go +++ b/quesma/ingest/processor_test.go @@ -9,8 +9,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/diag" "github.com/goccy/go-json" - "quesma_v2/core/diag" "strings" "sync/atomic" "testing" diff --git a/quesma/logger/logger.go b/quesma/logger/logger.go index eeb4862c9..c5c3c8965 100644 --- a/quesma/logger/logger.go +++ b/quesma/logger/logger.go @@ -7,11 +7,11 @@ import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/stats/errorstats" asyncQueryTracing "github.com/QuesmaOrg/quesma/quesma/tracing" + quesma_v2 "github.com/QuesmaOrg/quesma/v2/core" "github.com/rs/zerolog" "io" "net/http" "os" - quesma_v2 "quesma_v2/core" "time" ) diff --git a/quesma/processors/ab_test_processor.go b/quesma/processors/ab_test_processor.go index c2ac82ab5..458d29a87 100644 --- a/quesma/processors/ab_test_processor.go +++ b/quesma/processors/ab_test_processor.go @@ -6,8 +6,8 @@ package processors import ( "encoding/json" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/google/go-cmp/cmp" - quesma_api "quesma_v2/core" "strconv" ) diff --git a/quesma/processors/base_processor.go b/quesma/processors/base_processor.go index 971aaab54..c676c57fe 100644 --- a/quesma/processors/base_processor.go +++ b/quesma/processors/base_processor.go @@ -3,7 +3,7 @@ package processors -import quesma_api "quesma_v2/core" +import quesma_api "github.com/QuesmaOrg/quesma/v2/core" type BaseProcessor struct { InnerProcessors []quesma_api.Processor diff --git a/quesma/processors/es_to_ch_common/common.go b/quesma/processors/es_to_ch_common/common.go index f53c08c9f..1a61dc160 100644 --- a/quesma/processors/es_to_ch_common/common.go +++ b/quesma/processors/es_to_ch_common/common.go @@ -4,9 +4,9 @@ package es_to_ch_common import ( + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/ucarion/urlpath" "net/http" - quesma_api "quesma_v2/core" ) // Shared code for Elasticsearch to Clickhouse Query/Ingest processors diff --git a/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go b/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go index 7386ba977..ce5d739f2 100644 --- a/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go +++ b/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go @@ -20,11 +20,11 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" + "github.com/QuesmaOrg/quesma/v2/core" "github.com/rs/zerolog/log" "io" "net/http" "net/url" - "quesma_v2/core" ) type ElasticsearchToClickHouseIngestProcessor struct { diff --git a/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go b/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go index 723b789ce..97fe6d071 100644 --- a/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go +++ b/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go @@ -22,11 +22,11 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" + "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "io" "net/http" "net/url" - "quesma_v2/core" - "quesma_v2/core/tracing" "strings" "time" ) diff --git a/quesma/processors/mysql_ingest_processor.go b/quesma/processors/mysql_ingest_processor.go index a81606937..8e56897ee 100644 --- a/quesma/processors/mysql_ingest_processor.go +++ b/quesma/processors/mysql_ingest_processor.go @@ -6,8 +6,8 @@ package processors import ( "context" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/google/uuid" - quesma_api "quesma_v2/core" ) type MySqlIngestProcessor struct { diff --git a/quesma/processors/mysql_query_processor.go b/quesma/processors/mysql_query_processor.go index 9760938e7..237fc93c9 100644 --- a/quesma/processors/mysql_query_processor.go +++ b/quesma/processors/mysql_query_processor.go @@ -6,8 +6,8 @@ package processors import ( "context" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "log" - quesma_api "quesma_v2/core" ) type MySqlQueryProcessor struct { diff --git a/quesma/processors/postgres_ingest_processor.go b/quesma/processors/postgres_ingest_processor.go index 6fa21b95d..e1b221cee 100644 --- a/quesma/processors/postgres_ingest_processor.go +++ b/quesma/processors/postgres_ingest_processor.go @@ -6,9 +6,9 @@ package processors import ( "context" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/google/uuid" "log" - quesma_api "quesma_v2/core" ) type PostgresIngestProcessor struct { diff --git a/quesma/processors/postgres_query_processor.go b/quesma/processors/postgres_query_processor.go index a2fb01e6f..01dc28764 100644 --- a/quesma/processors/postgres_query_processor.go +++ b/quesma/processors/postgres_query_processor.go @@ -6,8 +6,8 @@ package processors import ( "context" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "log" - quesma_api "quesma_v2/core" ) type PostgresQueryProcessor struct { diff --git a/quesma/processors/postgres_to_mysql_processor.go b/quesma/processors/postgres_to_mysql_processor.go index 99a5cf0e0..497217296 100644 --- a/quesma/processors/postgres_to_mysql_processor.go +++ b/quesma/processors/postgres_to_mysql_processor.go @@ -6,9 +6,9 @@ package processors import ( "context" "fmt" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/jackc/pgx/v5/pgproto3" "log" - quesma_api "quesma_v2/core" ) type PostgresToMySqlProcessor struct { diff --git a/quesma/queryparser/query_parser_test.go b/quesma/queryparser/query_parser_test.go index 1631e2b21..bd9d9b93c 100644 --- a/quesma/queryparser/query_parser_test.go +++ b/quesma/queryparser/query_parser_test.go @@ -15,7 +15,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/testdata" "github.com/QuesmaOrg/quesma/quesma/util" - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" "strconv" "strings" "testing" diff --git a/quesma/quesma/dual_write_proxy.go b/quesma/quesma/dual_write_proxy.go index 1cf9ac1f5..6ad1e3c73 100644 --- a/quesma/quesma/dual_write_proxy.go +++ b/quesma/quesma/dual_write_proxy.go @@ -28,12 +28,12 @@ import ( "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" "github.com/QuesmaOrg/quesma/quesma/util" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "io" "net/http" - quesma_api "quesma_v2/core" - "quesma_v2/core/diag" - "quesma_v2/core/routes" - tracing "quesma_v2/core/tracing" "strconv" "strings" "sync/atomic" diff --git a/quesma/quesma/dual_write_proxy_v2.go b/quesma/quesma/dual_write_proxy_v2.go index 5c6c60533..f67bb97ac 100644 --- a/quesma/quesma/dual_write_proxy_v2.go +++ b/quesma/quesma/dual_write_proxy_v2.go @@ -17,8 +17,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net/http" - quesma_api "quesma_v2/core" "strconv" "sync/atomic" ) diff --git a/quesma/quesma/functionality/bulk/bulk.go b/quesma/quesma/functionality/bulk/bulk.go index d60eea61f..c42b99ced 100644 --- a/quesma/quesma/functionality/bulk/bulk.go +++ b/quesma/quesma/functionality/bulk/bulk.go @@ -15,11 +15,11 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/stats" "github.com/QuesmaOrg/quesma/quesma/table_resolver" + "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" "github.com/goccy/go-json" "io" "net/http" - "quesma_v2/core" - "quesma_v2/core/diag" "sort" "strings" "sync" diff --git a/quesma/quesma/functionality/doc/doc.go b/quesma/quesma/functionality/doc/doc.go index c3abe11e9..6841ff9e4 100644 --- a/quesma/quesma/functionality/doc/doc.go +++ b/quesma/quesma/functionality/doc/doc.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/functionality/bulk" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" ) func Write(ctx context.Context, tableName *string, body types.JSON, ip *ingest.IngestProcessor, ingestStatsEnabled bool, phoneHomeAgent diag.PhoneHomeClient, registry table_resolver.TableResolver, elasticsearchConnector *backend_connectors.ElasticsearchBackendConnector) (bulk.BulkItem, error) { diff --git a/quesma/quesma/functionality/terms_enum/terms_enum.go b/quesma/quesma/functionality/terms_enum/terms_enum.go index 261b4a020..5bee60ceb 100644 --- a/quesma/quesma/functionality/terms_enum/terms_enum.go +++ b/quesma/quesma/functionality/terms_enum/terms_enum.go @@ -13,9 +13,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/queryparser" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" + "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" - "quesma_v2/core/diag" - tracing "quesma_v2/core/tracing" "strconv" "time" ) diff --git a/quesma/quesma/functionality/terms_enum/terms_enum_test.go b/quesma/quesma/functionality/terms_enum/terms_enum_test.go index 195e6b742..75f90b219 100644 --- a/quesma/quesma/functionality/terms_enum/terms_enum_test.go +++ b/quesma/quesma/functionality/terms_enum/terms_enum_test.go @@ -18,10 +18,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" "github.com/stretchr/testify/assert" - "quesma_v2/core/diag" - tracing "quesma_v2/core/tracing" "regexp" "testing" ) diff --git a/quesma/quesma/matchers.go b/quesma/quesma/matchers.go index 7ffb6c173..0fe25f88e 100644 --- a/quesma/quesma/matchers.go +++ b/quesma/quesma/matchers.go @@ -8,9 +8,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/table_resolver" + "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" - "quesma_v2/core" - tracing "quesma_v2/core/tracing" "strings" ) diff --git a/quesma/quesma/matchers_test.go b/quesma/quesma/matchers_test.go index e1bad06b7..c7e7de6e8 100644 --- a/quesma/quesma/matchers_test.go +++ b/quesma/quesma/matchers_test.go @@ -4,8 +4,8 @@ package quesma import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" + mux "github.com/QuesmaOrg/quesma/v2/core" "github.com/stretchr/testify/assert" - mux "quesma_v2/core" "testing" ) diff --git a/quesma/quesma/quesma.go b/quesma/quesma/quesma.go index 4c73f8861..e66ce62fc 100644 --- a/quesma/quesma/quesma.go +++ b/quesma/quesma/quesma.go @@ -17,7 +17,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_v2 "quesma_v2/core" + quesma_v2 "github.com/QuesmaOrg/quesma/v2/core" ) type ( diff --git a/quesma/quesma/route_handlers.go b/quesma/quesma/route_handlers.go index e32ed21f9..6d498ef4f 100644 --- a/quesma/quesma/route_handlers.go +++ b/quesma/quesma/route_handlers.go @@ -22,9 +22,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "net/http" - quesma_api "quesma_v2/core" - "quesma_v2/core/tracing" ) func HandleDeletingAsyncSearchById(queryRunner QueryRunnerIFace, asyncSearchId string) (*quesma_api.Result, error) { diff --git a/quesma/quesma/router.go b/quesma/quesma/router.go index 99f19f4c8..856f129d3 100644 --- a/quesma/quesma/router.go +++ b/quesma/quesma/router.go @@ -26,11 +26,11 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" "net/http" - quesma_api "quesma_v2/core" - "quesma_v2/core/routes" - tracing "quesma_v2/core/tracing" "regexp" "strings" "sync" diff --git a/quesma/quesma/router_test.go b/quesma/quesma/router_test.go index d09792bc5..6d87317c3 100644 --- a/quesma/quesma/router_test.go +++ b/quesma/quesma/router_test.go @@ -11,9 +11,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" + mux "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/routes" "github.com/stretchr/testify/assert" - mux "quesma_v2/core" - "quesma_v2/core/routes" "strings" "testing" ) diff --git a/quesma/quesma/router_v2.go b/quesma/quesma/router_v2.go index 766cc6f77..d18de5383 100644 --- a/quesma/quesma/router_v2.go +++ b/quesma/quesma/router_v2.go @@ -17,10 +17,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/routes" "github.com/goccy/go-json" "net/http" - quesma_api "quesma_v2/core" - "quesma_v2/core/routes" "strings" "time" ) diff --git a/quesma/quesma/search.go b/quesma/quesma/search.go index 5710e98ad..48eb2efe3 100644 --- a/quesma/quesma/search.go +++ b/quesma/quesma/search.go @@ -25,11 +25,11 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" "net/http" - "quesma_v2/core" - "quesma_v2/core/diag" - tracing "quesma_v2/core/tracing" "strings" "sync/atomic" "time" diff --git a/quesma/quesma/search_ab_testing.go b/quesma/quesma/search_ab_testing.go index 97f9b387e..fa124e5d8 100644 --- a/quesma/quesma/search_ab_testing.go +++ b/quesma/quesma/search_ab_testing.go @@ -15,12 +15,12 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" "io" "net/http" - "quesma_v2/core" - "quesma_v2/core/diag" - tracing "quesma_v2/core/tracing" "time" ) diff --git a/quesma/quesma/search_common_table_test.go b/quesma/quesma/search_common_table_test.go index 0e746d507..069d216fe 100644 --- a/quesma/quesma/search_common_table_test.go +++ b/quesma/quesma/search_common_table_test.go @@ -16,8 +16,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/ui" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - mux "quesma_v2/core" - "quesma_v2/core/diag" + mux "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" "testing" ) diff --git a/quesma/quesma/search_norace_test.go b/quesma/quesma/search_norace_test.go index 6a2898373..68b16a7ad 100644 --- a/quesma/quesma/search_norace_test.go +++ b/quesma/quesma/search_norace_test.go @@ -16,8 +16,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/testdata" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "math/rand" - tracing "quesma_v2/core/tracing" "testing" ) diff --git a/quesma/quesma/search_test.go b/quesma/quesma/search_test.go index 41386b9ad..ec3897709 100644 --- a/quesma/quesma/search_test.go +++ b/quesma/quesma/search_test.go @@ -16,10 +16,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/testdata" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" "github.com/k0kubun/pp" "github.com/stretchr/testify/assert" - tracing "quesma_v2/core/tracing" "sort" "strconv" "strings" diff --git a/quesma/quesma/types/request_body.go b/quesma/quesma/types/request_body.go index 50367b243..1e4866fee 100644 --- a/quesma/quesma/types/request_body.go +++ b/quesma/quesma/types/request_body.go @@ -5,7 +5,7 @@ package types import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/end_user_errors" - quesma_api "quesma_v2/core" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "strings" ) diff --git a/quesma/quesma/ui/html_pages_test.go b/quesma/quesma/ui/html_pages_test.go index fc7ddf04b..d65cee4a9 100644 --- a/quesma/quesma/ui/html_pages_test.go +++ b/quesma/quesma/ui/html_pages_test.go @@ -11,9 +11,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/stats" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/diag" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" - "quesma_v2/core/diag" "testing" ) diff --git a/quesma/quesma/ui/live_tail.go b/quesma/quesma/ui/live_tail.go index 11e3c571a..130087e01 100644 --- a/quesma/quesma/ui/live_tail.go +++ b/quesma/quesma/ui/live_tail.go @@ -8,7 +8,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/buildinfo" "github.com/QuesmaOrg/quesma/quesma/quesma/ui/internal/builder" "github.com/QuesmaOrg/quesma/quesma/util" - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" "strconv" "strings" ) diff --git a/quesma/quesma/ui/live_tail_drilldown.go b/quesma/quesma/ui/live_tail_drilldown.go index 86f7128fd..b50a1104d 100644 --- a/quesma/quesma/ui/live_tail_drilldown.go +++ b/quesma/quesma/ui/live_tail_drilldown.go @@ -7,10 +7,10 @@ import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/quesma/ui/internal/builder" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/diag" + tracing "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/goccy/go-json" "gopkg.in/yaml.v3" - "quesma_v2/core/diag" - tracing "quesma_v2/core/tracing" "strings" ) diff --git a/quesma/quesma/ui/management_console.go b/quesma/quesma/ui/management_console.go index c0e3592ca..ba548d4ae 100644 --- a/quesma/quesma/ui/management_console.go +++ b/quesma/quesma/ui/management_console.go @@ -8,8 +8,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/diag" "github.com/rs/zerolog" - "quesma_v2/core/diag" "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/logger" diff --git a/quesma/quesma/ui/routing.go b/quesma/quesma/ui/routing.go index ee3648277..b74d3532d 100644 --- a/quesma/quesma/ui/routing.go +++ b/quesma/quesma/ui/routing.go @@ -4,7 +4,7 @@ package ui import ( "github.com/QuesmaOrg/quesma/quesma/quesma/ui/internal/builder" - "quesma_v2/core" + "github.com/QuesmaOrg/quesma/v2/core" "strings" ) diff --git a/quesma/quesma/v2_test.go b/quesma/quesma/v2_test.go index 91774afaa..39a6d8894 100644 --- a/quesma/quesma/v2_test.go +++ b/quesma/quesma/v2_test.go @@ -9,11 +9,11 @@ import ( "github.com/QuesmaOrg/quesma/quesma/frontend_connectors" "github.com/QuesmaOrg/quesma/quesma/processors" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "github.com/stretchr/testify/assert" "net/http" "os" "os/signal" - quesma_api "quesma_v2/core" "sync/atomic" "syscall" "testing" diff --git a/quesma/quesma/v2_test_objects.go b/quesma/quesma/v2_test_objects.go index 995085a1e..2ed0bbf13 100644 --- a/quesma/quesma/v2_test_objects.go +++ b/quesma/quesma/v2_test_objects.go @@ -7,8 +7,8 @@ import ( "context" "github.com/QuesmaOrg/quesma/quesma/frontend_connectors" "github.com/QuesmaOrg/quesma/quesma/processors" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "net/http" - quesma_api "quesma_v2/core" "sync/atomic" ) diff --git a/quesma/stats/errorstats/error_statistics.go b/quesma/stats/errorstats/error_statistics.go index 30129cf56..aafcdbbca 100644 --- a/quesma/stats/errorstats/error_statistics.go +++ b/quesma/stats/errorstats/error_statistics.go @@ -3,8 +3,8 @@ package errorstats import ( + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/rs/zerolog" - tracing "quesma_v2/core/tracing" "sort" "sync" "time" diff --git a/quesma/table_resolver/empty.go b/quesma/table_resolver/empty.go index 57b32ca27..9dbd5755c 100644 --- a/quesma/table_resolver/empty.go +++ b/quesma/table_resolver/empty.go @@ -4,7 +4,7 @@ package table_resolver import ( "fmt" - "quesma_v2/core" + "github.com/QuesmaOrg/quesma/v2/core" ) type EmptyTableResolver struct { diff --git a/quesma/table_resolver/model.go b/quesma/table_resolver/model.go index 74f559f1b..01135a81e 100644 --- a/quesma/table_resolver/model.go +++ b/quesma/table_resolver/model.go @@ -3,7 +3,7 @@ package table_resolver import ( - "quesma_v2/core" + "github.com/QuesmaOrg/quesma/v2/core" ) type TableResolver interface { diff --git a/quesma/table_resolver/rules.go b/quesma/table_resolver/rules.go index 6d25600eb..fc35a4458 100644 --- a/quesma/table_resolver/rules.go +++ b/quesma/table_resolver/rules.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/end_user_errors" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/util" - "quesma_v2/core" + "github.com/QuesmaOrg/quesma/v2/core" "reflect" "strings" ) diff --git a/quesma/table_resolver/table_resolver.go b/quesma/table_resolver/table_resolver.go index 90d4a0360..0c9a9a8d8 100644 --- a/quesma/table_resolver/table_resolver.go +++ b/quesma/table_resolver/table_resolver.go @@ -10,7 +10,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" - "quesma_v2/core" + "github.com/QuesmaOrg/quesma/v2/core" "sort" "sync" "time" diff --git a/quesma/table_resolver/table_resolver_dummy.go b/quesma/table_resolver/table_resolver_dummy.go index df3fef812..4c9cefddd 100644 --- a/quesma/table_resolver/table_resolver_dummy.go +++ b/quesma/table_resolver/table_resolver_dummy.go @@ -4,7 +4,7 @@ package table_resolver import ( - mux "quesma_v2/core" + mux "github.com/QuesmaOrg/quesma/v2/core" ) // DummyTableResolver is a dummy implementation of TableResolver to satisfy the QueryRunner and make it be compatible with the v2 api diff --git a/quesma/table_resolver/table_resolver_test.go b/quesma/table_resolver/table_resolver_test.go index efcb1a09e..0a2de2970 100644 --- a/quesma/table_resolver/table_resolver_test.go +++ b/quesma/table_resolver/table_resolver_test.go @@ -8,9 +8,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/common_table" "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + mux "github.com/QuesmaOrg/quesma/v2/core" "github.com/k0kubun/pp" "github.com/stretchr/testify/assert" - mux "quesma_v2/core" "reflect" "strings" "testing" diff --git a/quesma/telemetry/duration.go b/quesma/telemetry/duration.go index 5c499737a..393fa8fbb 100644 --- a/quesma/telemetry/duration.go +++ b/quesma/telemetry/duration.go @@ -4,7 +4,7 @@ package telemetry import ( "context" - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" "slices" "strconv" "sync" diff --git a/quesma/telemetry/multi_counter.go b/quesma/telemetry/multi_counter.go index fabcfc329..b618c80dd 100644 --- a/quesma/telemetry/multi_counter.go +++ b/quesma/telemetry/multi_counter.go @@ -4,7 +4,7 @@ package telemetry import ( "context" - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" "slices" "sync" ) diff --git a/quesma/telemetry/phone_home.go b/quesma/telemetry/phone_home.go index ba73c3e72..ac4e5d075 100644 --- a/quesma/telemetry/phone_home.go +++ b/quesma/telemetry/phone_home.go @@ -12,6 +12,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/health" telemetry_headers "github.com/QuesmaOrg/quesma/quesma/telemetry/headers" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/v2/core/diag" "github.com/goccy/go-json" "github.com/google/uuid" "github.com/shirou/gopsutil/v3/mem" @@ -19,8 +21,6 @@ import ( "net/http" "net/url" "os" - quesma_api "quesma_v2/core" - "quesma_v2/core/diag" "sort" "github.com/QuesmaOrg/quesma/quesma/logger" diff --git a/quesma/tracing/async_trace_logger.go b/quesma/tracing/async_trace_logger.go index 6cd1eb8a3..9cf315ada 100644 --- a/quesma/tracing/async_trace_logger.go +++ b/quesma/tracing/async_trace_logger.go @@ -6,8 +6,8 @@ import ( "context" "fmt" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/rs/zerolog" - tracing "quesma_v2/core/tracing" "strings" "time" ) diff --git a/quesma/tracing/async_trace_logger_test.go b/quesma/tracing/async_trace_logger_test.go index 2a153a5a9..3073cf088 100644 --- a/quesma/tracing/async_trace_logger_test.go +++ b/quesma/tracing/async_trace_logger_test.go @@ -5,10 +5,10 @@ package tracing import ( "context" "github.com/QuesmaOrg/quesma/quesma/util" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "os" - tracing "quesma_v2/core/tracing" "testing" "time" ) diff --git a/quesma/v2/core/dependency_injection.go b/quesma/v2/core/dependency_injection.go index a6d1555aa..2585489ae 100644 --- a/quesma/v2/core/dependency_injection.go +++ b/quesma/v2/core/dependency_injection.go @@ -4,7 +4,7 @@ package quesma_api import ( "fmt" - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" ) type Dependencies interface { diff --git a/quesma/v2/core/dependency_injection_test.go b/quesma/v2/core/dependency_injection_test.go index 9303d9bc2..50fc3ec48 100644 --- a/quesma/v2/core/dependency_injection_test.go +++ b/quesma/v2/core/dependency_injection_test.go @@ -3,7 +3,7 @@ package quesma_api import ( - "quesma_v2/core/diag" + "github.com/QuesmaOrg/quesma/v2/core/diag" "testing" ) diff --git a/quesma/v2/core/match_history.go b/quesma/v2/core/match_history.go index 1014eb58c..9a9aa2bec 100644 --- a/quesma/v2/core/match_history.go +++ b/quesma/v2/core/match_history.go @@ -3,7 +3,7 @@ package quesma_api import ( - "quesma_v2/core/routes" + "github.com/QuesmaOrg/quesma/v2/core/routes" "slices" "strings" "sync" diff --git a/quesma/v2/core/quesma_logger.go b/quesma/v2/core/quesma_logger.go index 9d3bccb16..c098e015e 100644 --- a/quesma/v2/core/quesma_logger.go +++ b/quesma/v2/core/quesma_logger.go @@ -4,9 +4,9 @@ package quesma_api import ( "context" + "github.com/QuesmaOrg/quesma/v2/core/tracing" "github.com/rs/zerolog" "os" - "quesma_v2/core/tracing" "time" ) diff --git a/quesma/v2/core/request_processors.go b/quesma/v2/core/request_processors.go index 787f7b9ce..daa71bc2b 100644 --- a/quesma/v2/core/request_processors.go +++ b/quesma/v2/core/request_processors.go @@ -4,7 +4,7 @@ package quesma_api import ( "context" - "quesma_v2/core/tracing" + "github.com/QuesmaOrg/quesma/v2/core/tracing" ) const opaqueIdHeaderKey = "X-Opaque-Id" diff --git a/quesma/v2_quesma_builder.go b/quesma/v2_quesma_builder.go index 8c6beb494..84484b751 100644 --- a/quesma/v2_quesma_builder.go +++ b/quesma/v2_quesma_builder.go @@ -9,8 +9,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_ingest" "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_query" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + quesma_api "github.com/QuesmaOrg/quesma/v2/core" "log" - quesma_api "quesma_v2/core" ) // BuildNewQuesma creates a new quesma instance with both Ingest And Query Processors, unused yet From 53fb9b3df3d782d57b383243575611b58a029fe2 Mon Sep 17 00:00:00 2001 From: Przemyslaw Delewski <102958445+pdelewski@users.noreply.github.com> Date: Tue, 14 Jan 2025 11:59:00 +0100 Subject: [PATCH 3/6] Make v2 package instead of module (#1185) --- quesma/Dockerfile | 3 -- .../clickhouse_backend_connector.go | 2 +- .../elasticsearch_backend_connector.go | 2 +- .../mysql_backend_connector.go | 2 +- .../postgres_backend_connector.go | 2 +- quesma/clickhouse/clickhouse.go | 4 +- quesma/clickhouse/connection.go | 2 +- quesma/clickhouse/quesma_communicator.go | 4 +- quesma/clickhouse/table_discovery.go | 2 +- quesma/common_table/const.go | 2 +- quesma/connectors/connector.go | 2 +- .../basic_http_frontend_connector.go | 4 +- .../basic_tcp_connection_handler.go | 2 +- .../basic_tcp_connector.go | 2 +- .../elastic_http_frontend_connector.go | 2 +- .../elasticsearch_ingest.go | 2 +- .../elasticsearch_query.go | 2 +- .../passthrough_tcp_connection_handler.go | 2 +- quesma/frontend_connectors/router_v2.go | 8 ++-- .../tcp_postgres_connection_handler.go | 2 +- quesma/go.mod | 3 -- quesma/ingest/common_table_test.go | 2 +- quesma/ingest/ingest_validator_test.go | 2 +- quesma/ingest/insert_test.go | 2 +- quesma/ingest/processor.go | 4 +- quesma/ingest/processor_test.go | 2 +- quesma/logger/logger.go | 2 +- quesma/processors/ab_test_processor.go | 2 +- quesma/processors/base_processor.go | 2 +- quesma/processors/es_to_ch_common/common.go | 2 +- ...icsearch_to_clickhouse_ingest_processor.go | 2 +- ...ticsearch_to_clickhouse_query_processor.go | 4 +- quesma/processors/mysql_ingest_processor.go | 2 +- quesma/processors/mysql_query_processor.go | 2 +- .../processors/postgres_ingest_processor.go | 2 +- quesma/processors/postgres_query_processor.go | 2 +- .../processors/postgres_to_mysql_processor.go | 2 +- quesma/queryparser/query_parser_test.go | 2 +- quesma/quesma/dual_write_proxy.go | 8 ++-- quesma/quesma/dual_write_proxy_v2.go | 2 +- quesma/quesma/functionality/bulk/bulk.go | 4 +- quesma/quesma/functionality/doc/doc.go | 2 +- .../functionality/terms_enum/terms_enum.go | 4 +- .../terms_enum/terms_enum_test.go | 4 +- quesma/quesma/matchers.go | 4 +- quesma/quesma/matchers_test.go | 2 +- quesma/quesma/quesma.go | 2 +- quesma/quesma/route_handlers.go | 4 +- quesma/quesma/router.go | 6 +-- quesma/quesma/router_test.go | 4 +- quesma/quesma/router_v2.go | 4 +- quesma/quesma/search.go | 6 +-- quesma/quesma/search_ab_testing.go | 6 +-- quesma/quesma/search_common_table_test.go | 4 +- quesma/quesma/search_norace_test.go | 2 +- quesma/quesma/search_test.go | 2 +- quesma/quesma/types/request_body.go | 2 +- quesma/quesma/ui/html_pages_test.go | 2 +- quesma/quesma/ui/live_tail.go | 2 +- quesma/quesma/ui/live_tail_drilldown.go | 4 +- quesma/quesma/ui/management_console.go | 2 +- quesma/quesma/ui/routing.go | 2 +- quesma/quesma/v2_test.go | 2 +- quesma/quesma/v2_test_objects.go | 2 +- quesma/stats/errorstats/error_statistics.go | 2 +- quesma/table_resolver/empty.go | 2 +- quesma/table_resolver/model.go | 2 +- quesma/table_resolver/rules.go | 2 +- quesma/table_resolver/table_resolver.go | 2 +- quesma/table_resolver/table_resolver_dummy.go | 2 +- quesma/table_resolver/table_resolver_test.go | 2 +- quesma/telemetry/duration.go | 2 +- quesma/telemetry/multi_counter.go | 2 +- quesma/telemetry/phone_home.go | 4 +- quesma/tracing/async_trace_logger.go | 2 +- quesma/tracing/async_trace_logger_test.go | 2 +- quesma/v2/core/dependency_injection.go | 2 +- quesma/v2/core/dependency_injection_test.go | 2 +- quesma/v2/core/match_history.go | 2 +- quesma/v2/core/mux_test.go | 3 +- quesma/v2/core/quesma_logger.go | 12 +---- quesma/v2/core/request_processors.go | 2 +- quesma/v2/go.mod | 22 --------- quesma/v2/go.sum | 45 ------------------- quesma/v2_quesma_builder.go | 2 +- 85 files changed, 109 insertions(+), 191 deletions(-) delete mode 100644 quesma/v2/go.mod delete mode 100644 quesma/v2/go.sum diff --git a/quesma/Dockerfile b/quesma/Dockerfile index 0ebb884aa..16b101814 100644 --- a/quesma/Dockerfile +++ b/quesma/Dockerfile @@ -2,9 +2,6 @@ FROM golang:alpine AS builder WORKDIR /quesma -## v2 is a seprate module, not package -COPY v2/go.mod v2/go.mod -COPY v2/go.sum v2/go.sum COPY go.mod go.sum ./ diff --git a/quesma/backend_connectors/clickhouse_backend_connector.go b/quesma/backend_connectors/clickhouse_backend_connector.go index 7183c1829..e6824fd6c 100644 --- a/quesma/backend_connectors/clickhouse_backend_connector.go +++ b/quesma/backend_connectors/clickhouse_backend_connector.go @@ -8,7 +8,7 @@ import ( "database/sql" "github.com/ClickHouse/clickhouse-go/v2" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" ) type ClickHouseBackendConnector struct { diff --git a/quesma/backend_connectors/elasticsearch_backend_connector.go b/quesma/backend_connectors/elasticsearch_backend_connector.go index a742344b6..015b08d0e 100644 --- a/quesma/backend_connectors/elasticsearch_backend_connector.go +++ b/quesma/backend_connectors/elasticsearch_backend_connector.go @@ -10,7 +10,7 @@ import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/quesma/config" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net/http" "time" ) diff --git a/quesma/backend_connectors/mysql_backend_connector.go b/quesma/backend_connectors/mysql_backend_connector.go index 45e1eb7c9..69a63f0a3 100644 --- a/quesma/backend_connectors/mysql_backend_connector.go +++ b/quesma/backend_connectors/mysql_backend_connector.go @@ -6,7 +6,7 @@ package backend_connectors import ( "context" "database/sql" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" _ "github.com/go-sql-driver/mysql" ) diff --git a/quesma/backend_connectors/postgres_backend_connector.go b/quesma/backend_connectors/postgres_backend_connector.go index 9877affc2..7ce13242f 100644 --- a/quesma/backend_connectors/postgres_backend_connector.go +++ b/quesma/backend_connectors/postgres_backend_connector.go @@ -5,7 +5,7 @@ package backend_connectors import ( "context" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/jackc/pgx/v4" ) diff --git a/quesma/clickhouse/clickhouse.go b/quesma/clickhouse/clickhouse.go index dfef6bb64..59d8704c4 100644 --- a/quesma/clickhouse/clickhouse.go +++ b/quesma/clickhouse/clickhouse.go @@ -13,8 +13,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "slices" "strings" "sync/atomic" diff --git a/quesma/clickhouse/connection.go b/quesma/clickhouse/connection.go index becf9cf49..19fbffde4 100644 --- a/quesma/clickhouse/connection.go +++ b/quesma/clickhouse/connection.go @@ -11,7 +11,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/buildinfo" "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net" "strings" "time" diff --git a/quesma/clickhouse/quesma_communicator.go b/quesma/clickhouse/quesma_communicator.go index 035a043aa..22f2bc87b 100644 --- a/quesma/clickhouse/quesma_communicator.go +++ b/quesma/clickhouse/quesma_communicator.go @@ -10,8 +10,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/model" "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "math/rand" "strconv" "strings" diff --git a/quesma/clickhouse/table_discovery.go b/quesma/clickhouse/table_discovery.go index dd05c3206..6a73c3b4f 100644 --- a/quesma/clickhouse/table_discovery.go +++ b/quesma/clickhouse/table_discovery.go @@ -13,7 +13,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/goccy/go-json" "strings" "sync/atomic" diff --git a/quesma/common_table/const.go b/quesma/common_table/const.go index fc070ea8d..6a804b6c6 100644 --- a/quesma/common_table/const.go +++ b/quesma/common_table/const.go @@ -5,7 +5,7 @@ package common_table import ( "context" "github.com/QuesmaOrg/quesma/quesma/logger" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" ) const TableName = "quesma_common_table" diff --git a/quesma/connectors/connector.go b/quesma/connectors/connector.go index 17453e71e..784053170 100644 --- a/quesma/connectors/connector.go +++ b/quesma/connectors/connector.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/telemetry" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" ) type Connector interface { diff --git a/quesma/frontend_connectors/basic_http_frontend_connector.go b/quesma/frontend_connectors/basic_http_frontend_connector.go index b455f400c..8dc14ce31 100644 --- a/quesma/frontend_connectors/basic_http_frontend_connector.go +++ b/quesma/frontend_connectors/basic_http_frontend_connector.go @@ -9,8 +9,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/schema" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "io" "net/http" "sync" diff --git a/quesma/frontend_connectors/basic_tcp_connection_handler.go b/quesma/frontend_connectors/basic_tcp_connection_handler.go index e5aaf0eeb..82c4dfac6 100644 --- a/quesma/frontend_connectors/basic_tcp_connection_handler.go +++ b/quesma/frontend_connectors/basic_tcp_connection_handler.go @@ -5,7 +5,7 @@ package frontend_connectors import ( "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "io" "net" ) diff --git a/quesma/frontend_connectors/basic_tcp_connector.go b/quesma/frontend_connectors/basic_tcp_connector.go index 52b7bf7eb..9910f5067 100644 --- a/quesma/frontend_connectors/basic_tcp_connector.go +++ b/quesma/frontend_connectors/basic_tcp_connector.go @@ -6,7 +6,7 @@ package frontend_connectors import ( "context" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net" "sync/atomic" ) diff --git a/quesma/frontend_connectors/elastic_http_frontend_connector.go b/quesma/frontend_connectors/elastic_http_frontend_connector.go index b596c7cd8..179276de7 100644 --- a/quesma/frontend_connectors/elastic_http_frontend_connector.go +++ b/quesma/frontend_connectors/elastic_http_frontend_connector.go @@ -8,7 +8,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/schema" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net/http" ) diff --git a/quesma/frontend_connectors/elasticsearch_ingest.go b/quesma/frontend_connectors/elasticsearch_ingest.go index a104a53d8..a197e0206 100644 --- a/quesma/frontend_connectors/elasticsearch_ingest.go +++ b/quesma/frontend_connectors/elasticsearch_ingest.go @@ -6,7 +6,7 @@ package frontend_connectors import ( "context" "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_common" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net/http" ) diff --git a/quesma/frontend_connectors/elasticsearch_query.go b/quesma/frontend_connectors/elasticsearch_query.go index 2f194e5a5..c0767da9a 100644 --- a/quesma/frontend_connectors/elasticsearch_query.go +++ b/quesma/frontend_connectors/elasticsearch_query.go @@ -8,7 +8,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_common" "github.com/QuesmaOrg/quesma/quesma/quesma/config" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net/http" ) diff --git a/quesma/frontend_connectors/passthrough_tcp_connection_handler.go b/quesma/frontend_connectors/passthrough_tcp_connection_handler.go index 6594e3752..3e10311fb 100644 --- a/quesma/frontend_connectors/passthrough_tcp_connection_handler.go +++ b/quesma/frontend_connectors/passthrough_tcp_connection_handler.go @@ -5,7 +5,7 @@ package frontend_connectors import ( "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "io" "net" ) diff --git a/quesma/frontend_connectors/router_v2.go b/quesma/frontend_connectors/router_v2.go index 2c10a2f73..4348fbd1a 100644 --- a/quesma/frontend_connectors/router_v2.go +++ b/quesma/frontend_connectors/router_v2.go @@ -22,10 +22,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/ui" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" - "github.com/QuesmaOrg/quesma/v2/core/routes" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "io" "net/http" "strings" diff --git a/quesma/frontend_connectors/tcp_postgres_connection_handler.go b/quesma/frontend_connectors/tcp_postgres_connection_handler.go index eb3ef9e7b..20e97a2f3 100644 --- a/quesma/frontend_connectors/tcp_postgres_connection_handler.go +++ b/quesma/frontend_connectors/tcp_postgres_connection_handler.go @@ -5,7 +5,7 @@ package frontend_connectors import ( "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/jackc/pgx/v5/pgproto3" "net" ) diff --git a/quesma/go.mod b/quesma/go.mod index 8bb3dd2ab..9400f859c 100644 --- a/quesma/go.mod +++ b/quesma/go.mod @@ -2,14 +2,11 @@ module github.com/QuesmaOrg/quesma/quesma go 1.23.2 -replace github.com/QuesmaOrg/quesma/v2 => ./v2 - require ( github.com/ClickHouse/clickhouse-go/v2 v2.30.0 github.com/DATA-DOG/go-sqlmock v1.5.2 github.com/DataDog/go-sqllexer v0.0.20 github.com/H0llyW00dzZ/cidr v1.2.1 - github.com/QuesmaOrg/quesma/v2 v2.0.0-00010101000000-000000000000 github.com/apparentlymart/go-cidr v1.1.0 github.com/barkimedes/go-deepcopy v0.0.0-20220514131651-17c30cfc62df github.com/coreos/go-semver v0.3.1 diff --git a/quesma/ingest/common_table_test.go b/quesma/ingest/common_table_test.go index 996cbf348..6c0573127 100644 --- a/quesma/ingest/common_table_test.go +++ b/quesma/ingest/common_table_test.go @@ -14,7 +14,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - mux "github.com/QuesmaOrg/quesma/v2/core" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/goccy/go-json" "github.com/stretchr/testify/assert" "testing" diff --git a/quesma/ingest/ingest_validator_test.go b/quesma/ingest/ingest_validator_test.go index a8925bb8d..2181f92a3 100644 --- a/quesma/ingest/ingest_validator_test.go +++ b/quesma/ingest/ingest_validator_test.go @@ -13,7 +13,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - mux "github.com/QuesmaOrg/quesma/v2/core" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/stretchr/testify/assert" "strings" "testing" diff --git a/quesma/ingest/insert_test.go b/quesma/ingest/insert_test.go index 17a4c5eb1..e99822cdb 100644 --- a/quesma/ingest/insert_test.go +++ b/quesma/ingest/insert_test.go @@ -15,7 +15,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - mux "github.com/QuesmaOrg/quesma/v2/core" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/stretchr/testify/assert" "slices" "strconv" diff --git a/quesma/ingest/processor.go b/quesma/ingest/processor.go index 4db1a0f5e..d974d8664 100644 --- a/quesma/ingest/processor.go +++ b/quesma/ingest/processor.go @@ -23,8 +23,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "github.com/goccy/go-json" "slices" "sort" diff --git a/quesma/ingest/processor_test.go b/quesma/ingest/processor_test.go index a78053913..e2edcb35a 100644 --- a/quesma/ingest/processor_test.go +++ b/quesma/ingest/processor_test.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "github.com/goccy/go-json" "strings" "sync/atomic" diff --git a/quesma/logger/logger.go b/quesma/logger/logger.go index c5c3c8965..f4bc943d9 100644 --- a/quesma/logger/logger.go +++ b/quesma/logger/logger.go @@ -7,7 +7,7 @@ import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/stats/errorstats" asyncQueryTracing "github.com/QuesmaOrg/quesma/quesma/tracing" - quesma_v2 "github.com/QuesmaOrg/quesma/v2/core" + quesma_v2 "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/rs/zerolog" "io" "net/http" diff --git a/quesma/processors/ab_test_processor.go b/quesma/processors/ab_test_processor.go index 458d29a87..2e718302c 100644 --- a/quesma/processors/ab_test_processor.go +++ b/quesma/processors/ab_test_processor.go @@ -6,7 +6,7 @@ package processors import ( "encoding/json" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/google/go-cmp/cmp" "strconv" ) diff --git a/quesma/processors/base_processor.go b/quesma/processors/base_processor.go index c676c57fe..5253f4f0b 100644 --- a/quesma/processors/base_processor.go +++ b/quesma/processors/base_processor.go @@ -3,7 +3,7 @@ package processors -import quesma_api "github.com/QuesmaOrg/quesma/v2/core" +import quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" type BaseProcessor struct { InnerProcessors []quesma_api.Processor diff --git a/quesma/processors/es_to_ch_common/common.go b/quesma/processors/es_to_ch_common/common.go index 1a61dc160..d2145b6b5 100644 --- a/quesma/processors/es_to_ch_common/common.go +++ b/quesma/processors/es_to_ch_common/common.go @@ -4,7 +4,7 @@ package es_to_ch_common import ( - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/ucarion/urlpath" "net/http" ) diff --git a/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go b/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go index ce5d739f2..84a7a9402 100644 --- a/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go +++ b/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go @@ -20,7 +20,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/rs/zerolog/log" "io" "net/http" diff --git a/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go b/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go index 97fe6d071..73ac31e9b 100644 --- a/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go +++ b/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go @@ -22,8 +22,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" - "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "io" "net/http" "net/url" diff --git a/quesma/processors/mysql_ingest_processor.go b/quesma/processors/mysql_ingest_processor.go index 8e56897ee..17b07452a 100644 --- a/quesma/processors/mysql_ingest_processor.go +++ b/quesma/processors/mysql_ingest_processor.go @@ -6,7 +6,7 @@ package processors import ( "context" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/google/uuid" ) diff --git a/quesma/processors/mysql_query_processor.go b/quesma/processors/mysql_query_processor.go index 237fc93c9..0fd4db4ab 100644 --- a/quesma/processors/mysql_query_processor.go +++ b/quesma/processors/mysql_query_processor.go @@ -6,7 +6,7 @@ package processors import ( "context" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "log" ) diff --git a/quesma/processors/postgres_ingest_processor.go b/quesma/processors/postgres_ingest_processor.go index e1b221cee..e5f88b6bb 100644 --- a/quesma/processors/postgres_ingest_processor.go +++ b/quesma/processors/postgres_ingest_processor.go @@ -6,7 +6,7 @@ package processors import ( "context" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/google/uuid" "log" ) diff --git a/quesma/processors/postgres_query_processor.go b/quesma/processors/postgres_query_processor.go index 01dc28764..efaa0bd53 100644 --- a/quesma/processors/postgres_query_processor.go +++ b/quesma/processors/postgres_query_processor.go @@ -6,7 +6,7 @@ package processors import ( "context" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "log" ) diff --git a/quesma/processors/postgres_to_mysql_processor.go b/quesma/processors/postgres_to_mysql_processor.go index 497217296..85667c7da 100644 --- a/quesma/processors/postgres_to_mysql_processor.go +++ b/quesma/processors/postgres_to_mysql_processor.go @@ -6,7 +6,7 @@ package processors import ( "context" "fmt" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/jackc/pgx/v5/pgproto3" "log" ) diff --git a/quesma/queryparser/query_parser_test.go b/quesma/queryparser/query_parser_test.go index bd9d9b93c..8f5f6b1b0 100644 --- a/quesma/queryparser/query_parser_test.go +++ b/quesma/queryparser/query_parser_test.go @@ -15,7 +15,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/testdata" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "strconv" "strings" "testing" diff --git a/quesma/quesma/dual_write_proxy.go b/quesma/quesma/dual_write_proxy.go index 6ad1e3c73..d9f8a4e5a 100644 --- a/quesma/quesma/dual_write_proxy.go +++ b/quesma/quesma/dual_write_proxy.go @@ -28,10 +28,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" - "github.com/QuesmaOrg/quesma/v2/core/routes" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "io" "net/http" "strconv" diff --git a/quesma/quesma/dual_write_proxy_v2.go b/quesma/quesma/dual_write_proxy_v2.go index f67bb97ac..b29469c72 100644 --- a/quesma/quesma/dual_write_proxy_v2.go +++ b/quesma/quesma/dual_write_proxy_v2.go @@ -17,7 +17,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net/http" "strconv" "sync/atomic" diff --git a/quesma/quesma/functionality/bulk/bulk.go b/quesma/quesma/functionality/bulk/bulk.go index c42b99ced..b223c4ffb 100644 --- a/quesma/quesma/functionality/bulk/bulk.go +++ b/quesma/quesma/functionality/bulk/bulk.go @@ -15,8 +15,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/stats" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "github.com/goccy/go-json" "io" "net/http" diff --git a/quesma/quesma/functionality/doc/doc.go b/quesma/quesma/functionality/doc/doc.go index 6841ff9e4..ffe10d3be 100644 --- a/quesma/quesma/functionality/doc/doc.go +++ b/quesma/quesma/functionality/doc/doc.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/functionality/bulk" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" ) func Write(ctx context.Context, tableName *string, body types.JSON, ip *ingest.IngestProcessor, ingestStatsEnabled bool, phoneHomeAgent diag.PhoneHomeClient, registry table_resolver.TableResolver, elasticsearchConnector *backend_connectors.ElasticsearchBackendConnector) (bulk.BulkItem, error) { diff --git a/quesma/quesma/functionality/terms_enum/terms_enum.go b/quesma/quesma/functionality/terms_enum/terms_enum.go index 5bee60ceb..a02ec4eb5 100644 --- a/quesma/quesma/functionality/terms_enum/terms_enum.go +++ b/quesma/quesma/functionality/terms_enum/terms_enum.go @@ -13,8 +13,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/queryparser" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" - "github.com/QuesmaOrg/quesma/v2/core/diag" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "strconv" "time" diff --git a/quesma/quesma/functionality/terms_enum/terms_enum_test.go b/quesma/quesma/functionality/terms_enum/terms_enum_test.go index 75f90b219..a41469c2f 100644 --- a/quesma/quesma/functionality/terms_enum/terms_enum_test.go +++ b/quesma/quesma/functionality/terms_enum/terms_enum_test.go @@ -18,8 +18,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "github.com/stretchr/testify/assert" "regexp" diff --git a/quesma/quesma/matchers.go b/quesma/quesma/matchers.go index 0fe25f88e..0d8b54f1b 100644 --- a/quesma/quesma/matchers.go +++ b/quesma/quesma/matchers.go @@ -8,8 +8,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "strings" ) diff --git a/quesma/quesma/matchers_test.go b/quesma/quesma/matchers_test.go index c7e7de6e8..53eec2ac5 100644 --- a/quesma/quesma/matchers_test.go +++ b/quesma/quesma/matchers_test.go @@ -4,7 +4,7 @@ package quesma import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" - mux "github.com/QuesmaOrg/quesma/v2/core" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/stretchr/testify/assert" "testing" ) diff --git a/quesma/quesma/quesma.go b/quesma/quesma/quesma.go index e66ce62fc..c0d8bf727 100644 --- a/quesma/quesma/quesma.go +++ b/quesma/quesma/quesma.go @@ -17,7 +17,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" "github.com/QuesmaOrg/quesma/quesma/util" - quesma_v2 "github.com/QuesmaOrg/quesma/v2/core" + quesma_v2 "github.com/QuesmaOrg/quesma/quesma/v2/core" ) type ( diff --git a/quesma/quesma/route_handlers.go b/quesma/quesma/route_handlers.go index 6d498ef4f..2da1d540b 100644 --- a/quesma/quesma/route_handlers.go +++ b/quesma/quesma/route_handlers.go @@ -22,8 +22,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "net/http" ) diff --git a/quesma/quesma/router.go b/quesma/quesma/router.go index 856f129d3..d507e0839 100644 --- a/quesma/quesma/router.go +++ b/quesma/quesma/router.go @@ -26,9 +26,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/routes" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "net/http" "regexp" diff --git a/quesma/quesma/router_test.go b/quesma/quesma/router_test.go index 6d87317c3..1ae229028 100644 --- a/quesma/quesma/router_test.go +++ b/quesma/quesma/router_test.go @@ -11,8 +11,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/telemetry" - mux "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/routes" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/routes" "github.com/stretchr/testify/assert" "strings" "testing" diff --git a/quesma/quesma/router_v2.go b/quesma/quesma/router_v2.go index d18de5383..3394e4d20 100644 --- a/quesma/quesma/router_v2.go +++ b/quesma/quesma/router_v2.go @@ -17,8 +17,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/routes" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/routes" "github.com/goccy/go-json" "net/http" "strings" diff --git a/quesma/quesma/search.go b/quesma/quesma/search.go index 48eb2efe3..ab5e4802e 100644 --- a/quesma/quesma/search.go +++ b/quesma/quesma/search.go @@ -25,9 +25,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "net/http" "strings" diff --git a/quesma/quesma/search_ab_testing.go b/quesma/quesma/search_ab_testing.go index fa124e5d8..b9406d70b 100644 --- a/quesma/quesma/search_ab_testing.go +++ b/quesma/quesma/search_ab_testing.go @@ -15,9 +15,9 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "io" "net/http" diff --git a/quesma/quesma/search_common_table_test.go b/quesma/quesma/search_common_table_test.go index 069d216fe..e27a05356 100644 --- a/quesma/quesma/search_common_table_test.go +++ b/quesma/quesma/search_common_table_test.go @@ -16,8 +16,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/quesma/ui" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" - mux "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "testing" ) diff --git a/quesma/quesma/search_norace_test.go b/quesma/quesma/search_norace_test.go index 68b16a7ad..f7378c9b7 100644 --- a/quesma/quesma/search_norace_test.go +++ b/quesma/quesma/search_norace_test.go @@ -16,7 +16,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/testdata" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "math/rand" "testing" ) diff --git a/quesma/quesma/search_test.go b/quesma/quesma/search_test.go index ec3897709..1b3af7c68 100644 --- a/quesma/quesma/search_test.go +++ b/quesma/quesma/search_test.go @@ -16,7 +16,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/testdata" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "github.com/k0kubun/pp" "github.com/stretchr/testify/assert" diff --git a/quesma/quesma/types/request_body.go b/quesma/quesma/types/request_body.go index 1e4866fee..4819f64b9 100644 --- a/quesma/quesma/types/request_body.go +++ b/quesma/quesma/types/request_body.go @@ -5,7 +5,7 @@ package types import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/end_user_errors" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "strings" ) diff --git a/quesma/quesma/ui/html_pages_test.go b/quesma/quesma/ui/html_pages_test.go index d65cee4a9..ef0ddd64c 100644 --- a/quesma/quesma/ui/html_pages_test.go +++ b/quesma/quesma/ui/html_pages_test.go @@ -11,7 +11,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/stats" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "testing" diff --git a/quesma/quesma/ui/live_tail.go b/quesma/quesma/ui/live_tail.go index 130087e01..6c19fbf92 100644 --- a/quesma/quesma/ui/live_tail.go +++ b/quesma/quesma/ui/live_tail.go @@ -8,7 +8,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/buildinfo" "github.com/QuesmaOrg/quesma/quesma/quesma/ui/internal/builder" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "strconv" "strings" ) diff --git a/quesma/quesma/ui/live_tail_drilldown.go b/quesma/quesma/ui/live_tail_drilldown.go index b50a1104d..0173c4d40 100644 --- a/quesma/quesma/ui/live_tail_drilldown.go +++ b/quesma/quesma/ui/live_tail_drilldown.go @@ -7,8 +7,8 @@ import ( "fmt" "github.com/QuesmaOrg/quesma/quesma/quesma/ui/internal/builder" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" - tracing "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" + tracing "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/goccy/go-json" "gopkg.in/yaml.v3" "strings" diff --git a/quesma/quesma/ui/management_console.go b/quesma/quesma/ui/management_console.go index ba548d4ae..4bc59e795 100644 --- a/quesma/quesma/ui/management_console.go +++ b/quesma/quesma/ui/management_console.go @@ -8,7 +8,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/table_resolver" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "github.com/rs/zerolog" "github.com/QuesmaOrg/quesma/quesma/clickhouse" diff --git a/quesma/quesma/ui/routing.go b/quesma/quesma/ui/routing.go index b74d3532d..15c60765f 100644 --- a/quesma/quesma/ui/routing.go +++ b/quesma/quesma/ui/routing.go @@ -4,7 +4,7 @@ package ui import ( "github.com/QuesmaOrg/quesma/quesma/quesma/ui/internal/builder" - "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core" "strings" ) diff --git a/quesma/quesma/v2_test.go b/quesma/quesma/v2_test.go index 39a6d8894..8098dcb91 100644 --- a/quesma/quesma/v2_test.go +++ b/quesma/quesma/v2_test.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/frontend_connectors" "github.com/QuesmaOrg/quesma/quesma/processors" "github.com/QuesmaOrg/quesma/quesma/quesma/config" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/stretchr/testify/assert" "net/http" "os" diff --git a/quesma/quesma/v2_test_objects.go b/quesma/quesma/v2_test_objects.go index 2ed0bbf13..e289f0366 100644 --- a/quesma/quesma/v2_test_objects.go +++ b/quesma/quesma/v2_test_objects.go @@ -7,7 +7,7 @@ import ( "context" "github.com/QuesmaOrg/quesma/quesma/frontend_connectors" "github.com/QuesmaOrg/quesma/quesma/processors" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "net/http" "sync/atomic" ) diff --git a/quesma/stats/errorstats/error_statistics.go b/quesma/stats/errorstats/error_statistics.go index aafcdbbca..eef32f024 100644 --- a/quesma/stats/errorstats/error_statistics.go +++ b/quesma/stats/errorstats/error_statistics.go @@ -3,7 +3,7 @@ package errorstats import ( - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/rs/zerolog" "sort" "sync" diff --git a/quesma/table_resolver/empty.go b/quesma/table_resolver/empty.go index 9dbd5755c..16f3b935f 100644 --- a/quesma/table_resolver/empty.go +++ b/quesma/table_resolver/empty.go @@ -4,7 +4,7 @@ package table_resolver import ( "fmt" - "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core" ) type EmptyTableResolver struct { diff --git a/quesma/table_resolver/model.go b/quesma/table_resolver/model.go index 01135a81e..d611d1d28 100644 --- a/quesma/table_resolver/model.go +++ b/quesma/table_resolver/model.go @@ -3,7 +3,7 @@ package table_resolver import ( - "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core" ) type TableResolver interface { diff --git a/quesma/table_resolver/rules.go b/quesma/table_resolver/rules.go index fc35a4458..619bac48f 100644 --- a/quesma/table_resolver/rules.go +++ b/quesma/table_resolver/rules.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/end_user_errors" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core" "reflect" "strings" ) diff --git a/quesma/table_resolver/table_resolver.go b/quesma/table_resolver/table_resolver.go index 0c9a9a8d8..fa75b68c2 100644 --- a/quesma/table_resolver/table_resolver.go +++ b/quesma/table_resolver/table_resolver.go @@ -10,7 +10,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" - "github.com/QuesmaOrg/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core" "sort" "sync" "time" diff --git a/quesma/table_resolver/table_resolver_dummy.go b/quesma/table_resolver/table_resolver_dummy.go index 4c9cefddd..79b0e2a12 100644 --- a/quesma/table_resolver/table_resolver_dummy.go +++ b/quesma/table_resolver/table_resolver_dummy.go @@ -4,7 +4,7 @@ package table_resolver import ( - mux "github.com/QuesmaOrg/quesma/v2/core" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" ) // DummyTableResolver is a dummy implementation of TableResolver to satisfy the QueryRunner and make it be compatible with the v2 api diff --git a/quesma/table_resolver/table_resolver_test.go b/quesma/table_resolver/table_resolver_test.go index 0a2de2970..2e3c299fd 100644 --- a/quesma/table_resolver/table_resolver_test.go +++ b/quesma/table_resolver/table_resolver_test.go @@ -8,7 +8,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/common_table" "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/quesma/config" - mux "github.com/QuesmaOrg/quesma/v2/core" + mux "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/k0kubun/pp" "github.com/stretchr/testify/assert" "reflect" diff --git a/quesma/telemetry/duration.go b/quesma/telemetry/duration.go index 393fa8fbb..b5f082fc6 100644 --- a/quesma/telemetry/duration.go +++ b/quesma/telemetry/duration.go @@ -4,7 +4,7 @@ package telemetry import ( "context" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "slices" "strconv" "sync" diff --git a/quesma/telemetry/multi_counter.go b/quesma/telemetry/multi_counter.go index b618c80dd..eeed6b5ff 100644 --- a/quesma/telemetry/multi_counter.go +++ b/quesma/telemetry/multi_counter.go @@ -4,7 +4,7 @@ package telemetry import ( "context" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "slices" "sync" ) diff --git a/quesma/telemetry/phone_home.go b/quesma/telemetry/phone_home.go index ac4e5d075..252e35af1 100644 --- a/quesma/telemetry/phone_home.go +++ b/quesma/telemetry/phone_home.go @@ -12,8 +12,8 @@ import ( "github.com/QuesmaOrg/quesma/quesma/elasticsearch" "github.com/QuesmaOrg/quesma/quesma/health" telemetry_headers "github.com/QuesmaOrg/quesma/quesma/telemetry/headers" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" - "github.com/QuesmaOrg/quesma/v2/core/diag" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "github.com/goccy/go-json" "github.com/google/uuid" "github.com/shirou/gopsutil/v3/mem" diff --git a/quesma/tracing/async_trace_logger.go b/quesma/tracing/async_trace_logger.go index 9cf315ada..2ee94b960 100644 --- a/quesma/tracing/async_trace_logger.go +++ b/quesma/tracing/async_trace_logger.go @@ -6,7 +6,7 @@ import ( "context" "fmt" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/rs/zerolog" "strings" "time" diff --git a/quesma/tracing/async_trace_logger_test.go b/quesma/tracing/async_trace_logger_test.go index 3073cf088..8a7fe3f27 100644 --- a/quesma/tracing/async_trace_logger_test.go +++ b/quesma/tracing/async_trace_logger_test.go @@ -5,7 +5,7 @@ package tracing import ( "context" "github.com/QuesmaOrg/quesma/quesma/util" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/rs/zerolog" "github.com/stretchr/testify/assert" "os" diff --git a/quesma/v2/core/dependency_injection.go b/quesma/v2/core/dependency_injection.go index 2585489ae..083a937d5 100644 --- a/quesma/v2/core/dependency_injection.go +++ b/quesma/v2/core/dependency_injection.go @@ -4,7 +4,7 @@ package quesma_api import ( "fmt" - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" ) type Dependencies interface { diff --git a/quesma/v2/core/dependency_injection_test.go b/quesma/v2/core/dependency_injection_test.go index 50fc3ec48..86017ceab 100644 --- a/quesma/v2/core/dependency_injection_test.go +++ b/quesma/v2/core/dependency_injection_test.go @@ -3,7 +3,7 @@ package quesma_api import ( - "github.com/QuesmaOrg/quesma/v2/core/diag" + "github.com/QuesmaOrg/quesma/quesma/v2/core/diag" "testing" ) diff --git a/quesma/v2/core/match_history.go b/quesma/v2/core/match_history.go index 9a9aa2bec..b38ca40be 100644 --- a/quesma/v2/core/match_history.go +++ b/quesma/v2/core/match_history.go @@ -3,7 +3,7 @@ package quesma_api import ( - "github.com/QuesmaOrg/quesma/v2/core/routes" + "github.com/QuesmaOrg/quesma/quesma/v2/core/routes" "slices" "strings" "sync" diff --git a/quesma/v2/core/mux_test.go b/quesma/v2/core/mux_test.go index 46f306941..bd46facfa 100644 --- a/quesma/v2/core/mux_test.go +++ b/quesma/v2/core/mux_test.go @@ -5,6 +5,7 @@ package quesma_api import ( "context" "github.com/stretchr/testify/assert" + "net/http" "testing" ) @@ -75,6 +76,6 @@ func toRequest(path, method string, body string) *Request { } } -func mockHandler(_ context.Context, _ *Request) (*Result, error) { +func mockHandler(_ context.Context, _ *Request, _ http.ResponseWriter) (*Result, error) { return &Result{}, nil } diff --git a/quesma/v2/core/quesma_logger.go b/quesma/v2/core/quesma_logger.go index c098e015e..6b4fc87bc 100644 --- a/quesma/v2/core/quesma_logger.go +++ b/quesma/v2/core/quesma_logger.go @@ -4,17 +4,12 @@ package quesma_api import ( "context" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" "github.com/rs/zerolog" "os" "time" ) -const ( - stdLogFileName = "quesma.log" - errLogFileName = "err.log" -) - const ( RID = "request_id" // request id key for the logger Reason = "reason" // Known error reason key for the logger @@ -24,11 +19,6 @@ const ( ReasonPrefixUnsupportedQueryType = "unsupported_search_query: " // Reason for Error messages for unsupported queries will start with this prefix ) -const ( - initialBufferSize = 32 * 1024 - bufferSizeChannel = 1024 -) - type QuesmaLogger interface { Debug() *zerolog.Event Info() *zerolog.Event diff --git a/quesma/v2/core/request_processors.go b/quesma/v2/core/request_processors.go index daa71bc2b..edad6a65a 100644 --- a/quesma/v2/core/request_processors.go +++ b/quesma/v2/core/request_processors.go @@ -4,7 +4,7 @@ package quesma_api import ( "context" - "github.com/QuesmaOrg/quesma/v2/core/tracing" + "github.com/QuesmaOrg/quesma/quesma/v2/core/tracing" ) const opaqueIdHeaderKey = "X-Opaque-Id" diff --git a/quesma/v2/go.mod b/quesma/v2/go.mod deleted file mode 100644 index 20d01af19..000000000 --- a/quesma/v2/go.mod +++ /dev/null @@ -1,22 +0,0 @@ -module github.com/QuesmaOrg/quesma/v2 - -go 1.23.2 - -require ( - github.com/google/uuid v1.6.0 - github.com/rs/zerolog v1.33.0 - github.com/stretchr/testify v1.10.0 - github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb -) - -require ( - github.com/davecgh/go-spew v1.1.1 // indirect - github.com/kr/pretty v0.3.0 // indirect - github.com/mattn/go-colorable v0.1.13 // indirect - github.com/mattn/go-isatty v0.0.19 // indirect - github.com/pmezard/go-difflib v1.0.0 // indirect - github.com/rogpeppe/go-internal v1.13.1 // indirect - golang.org/x/sys v0.21.0 // indirect - gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect - gopkg.in/yaml.v3 v3.0.1 // indirect -) diff --git a/quesma/v2/go.sum b/quesma/v2/go.sum deleted file mode 100644 index b83fb7973..000000000 --- a/quesma/v2/go.sum +++ /dev/null @@ -1,45 +0,0 @@ -github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= -github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= -github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= -github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= -github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= -github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= -github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= -github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= -github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= -github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= -github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= -github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= -github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII= -github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o= -github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= -github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8= -github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss= -github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA= -github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb h1:Ywfo8sUltxogBpFuMOFRrrSifO788kAFxmvVw31PtQQ= -github.com/ucarion/urlpath v0.0.0-20200424170820-7ccc79b76bbb/go.mod h1:ikPs9bRWicNw3S7XpJ8sK/smGwU9WcSVU3dy9qahYBM= -golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws= -golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= -gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q= -gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= -gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= -gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/quesma/v2_quesma_builder.go b/quesma/v2_quesma_builder.go index 84484b751..e0de0c91e 100644 --- a/quesma/v2_quesma_builder.go +++ b/quesma/v2_quesma_builder.go @@ -9,7 +9,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_ingest" "github.com/QuesmaOrg/quesma/quesma/processors/es_to_ch_query" "github.com/QuesmaOrg/quesma/quesma/quesma/config" - quesma_api "github.com/QuesmaOrg/quesma/v2/core" + quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "log" ) From 091eabbe7159ac555e7fe93682ab1fb76036624e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Przemys=C5=82aw=20Hejman?= Date: Tue, 14 Jan 2025 17:18:30 +0100 Subject: [PATCH 4/6] Update NOTICE.MD (#1186) There's been a change in Quesma dependencies Co-authored-by: Quesma[bot] --- NOTICE.MD | 375 ++++++++++++++++++++++++++++++++++++++++++------------ 1 file changed, 294 insertions(+), 81 deletions(-) diff --git a/NOTICE.MD b/NOTICE.MD index 603ac1de9..6d8a292e9 100644 --- a/NOTICE.MD +++ b/NOTICE.MD @@ -2330,11 +2330,11 @@ SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/tailscale/hujson -Version : v0.0.0-20221223112325-20486734a56a -Time : 2022-12-23T11:23:25Z +Version : v0.0.0-20241010212012-29efb4a0184b +Time : 2024-10-10T21:20:12Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/github.com/tailscale/hujson@v0.0.0-20221223112325-20486734a56a/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/tailscale/hujson@v0.0.0-20241010212012-29efb4a0184b/LICENSE: Copyright (c) 2019 Tailscale Inc. All rights reserved. @@ -2429,11 +2429,11 @@ SOFTWARE. -------------------------------------------------------------------------------- #### Module : golang.org/x/exp -Version : v0.0.0-20241108190413-2d47ceb2692f -Time : 2024-11-08T19:04:13Z +Version : v0.0.0-20250106191152-7588d65b2ba8 +Time : 2025-01-06T19:11:52Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/golang.org/x/exp@v0.0.0-20241108190413-2d47ceb2692f/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/exp@v0.0.0-20250106191152-7588d65b2ba8/LICENSE: Copyright 2009 The Go Authors. @@ -2466,11 +2466,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : golang.org/x/oauth2 -Version : v0.24.0 -Time : 2024-11-01T18:29:12Z +Version : v0.25.0 +Time : 2025-01-04T02:44:49Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/golang.org/x/oauth2@v0.24.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/oauth2@v0.25.0/LICENSE: Copyright 2009 The Go Authors. @@ -3341,11 +3341,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/ClickHouse/ch-go -Version : v0.61.5 -Time : 2024-03-08T18:06:12Z +Version : v0.63.1 +Time : 2024-10-22T14:40:16Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/github.com/!click!house/ch-go@v0.61.5/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/!click!house/ch-go@v0.63.1/LICENSE: Copyright 2016-2023 ClickHouse, Inc. Apache License @@ -3674,11 +3674,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/cenkalti/backoff/v4 -Version : v4.2.1 -Time : 2023-02-28T16:21:33Z +Version : v4.3.0 +Time : 2024-01-02T22:56:19Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v4@v4.2.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/cenkalti/backoff/v4@v4.3.0/LICENSE: The MIT License (MIT) @@ -4787,11 +4787,11 @@ SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/creack/pty -Version : v1.1.9 -Time : 2019-09-25T15:36:33Z +Version : v1.1.7 +Time : 2019-06-29T15:33:18Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/creack/pty@v1.1.9/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/creack/pty@v1.1.7/LICENSE: Copyright (c) 2011 Keith Rarick @@ -5084,11 +5084,11 @@ Apache License -------------------------------------------------------------------------------- #### Module : github.com/dmarkham/enumer -Version : v1.5.9 -Time : 2023-10-17T13:58:22Z +Version : v1.5.10 +Time : 2024-06-17T17:13:14Z Licence : BSD-2-Clause -Contents of probable licence file $GOMODCACHE/github.com/dmarkham/enumer@v1.5.9/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/dmarkham/enumer@v1.5.10/LICENSE: Copyright (c) 2018, Álvaro López Espinosa All rights reserved. @@ -5782,11 +5782,11 @@ Copyright (c) 2016 Felix Geisendörfer (felix@debuggable.com) -------------------------------------------------------------------------------- #### Module : github.com/fsnotify/fsnotify -Version : v1.7.0 -Time : 2023-10-22T06:24:00Z +Version : v1.8.0 +Time : 2024-10-31T10:15:51Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/github.com/fsnotify/fsnotify@v1.7.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/fsnotify/fsnotify@v1.8.0/LICENSE: Copyright © 2012 The Go Authors. All rights reserved. Copyright © fsnotify Authors. All rights reserved. @@ -6370,11 +6370,11 @@ Contents of probable licence file $GOMODCACHE/github.com/go-logr/stdr@v1.2.2/LIC -------------------------------------------------------------------------------- #### Module : github.com/go-ole/go-ole -Version : v1.2.6 -Time : 2021-09-15T00:35:42Z +Version : v1.3.0 +Time : 2023-08-04T03:10:36Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/go-ole/go-ole@v1.2.6/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/go-ole/go-ole@v1.3.0/LICENSE: The MIT License (MIT) @@ -7197,11 +7197,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : github.com/hashicorp/errwrap -Version : v1.0.0 -Time : 2018-08-24T00:39:10Z +Version : v1.1.0 +Time : 2020-07-14T15:51:01Z Licence : MPL-2.0 -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/errwrap@v1.0.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/errwrap@v1.1.0/LICENSE: Mozilla Public License, version 2.0 @@ -7561,11 +7561,13 @@ Exhibit B - “Incompatible With Secondary Licenses” Notice -------------------------------------------------------------------------------- #### Module : github.com/hashicorp/go-version -Version : v1.6.0 -Time : 2022-06-28T09:04:47Z +Version : v1.7.0 +Time : 2024-05-24T10:16:12Z Licence : MPL-2.0 -Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-version@v1.6.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/hashicorp/go-version@v1.7.0/LICENSE: + +Copyright (c) 2014 HashiCorp, Inc. Mozilla Public License, version 2.0 @@ -8212,11 +8214,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/jackc/pgtype -Version : v1.14.0 -Time : 2023-02-11T14:36:37Z +Version : v1.14.4 +Time : 2024-10-18T22:32:02Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/jackc/pgtype@v1.14.0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/jackc/pgtype@v1.14.4/LICENSE: Copyright (c) 2013-2021 Jack Christensen @@ -8819,11 +8821,11 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI -------------------------------------------------------------------------------- #### Module : github.com/lufia/plan9stats -Version : v0.0.0-20211012122336-39d0f177ccd0 -Time : 2021-10-12T12:23:36Z +Version : v0.0.0-20240909124753-873cd0166683 +Time : 2024-09-09T12:47:53Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/github.com/lufia/plan9stats@v0.0.0-20211012122336-39d0f177ccd0/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/lufia/plan9stats@v0.0.0-20240909124753-873cd0166683/LICENSE: BSD 3-Clause License @@ -8924,11 +8926,11 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/mattn/go-colorable -Version : v0.1.13 -Time : 2022-08-15T05:53:26Z +Version : v0.1.14 +Time : 2025-01-10T08:29:27Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/mattn/go-colorable@v0.1.13/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/mattn/go-colorable@v0.1.14/LICENSE: The MIT License (MIT) @@ -10874,11 +10876,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/pierrec/lz4/v4 -Version : v4.1.21 -Time : 2024-01-08T20:17:19Z +Version : v4.1.22 +Time : 2024-12-12T16:53:43Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.21/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/pierrec/lz4/v4@v4.1.22/LICENSE: Copyright (c) 2015, Pierre Curto All rights reserved. @@ -10949,11 +10951,11 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : github.com/power-devops/perfstat -Version : v0.0.0-20210106213030-5aafc221ea8c -Time : 2021-01-06T21:30:30Z +Version : v0.0.0-20240221224432-82ca36839d55 +Time : 2024-02-21T22:44:32Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/power-devops/perfstat@v0.0.0-20210106213030-5aafc221ea8c/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/power-devops/perfstat@v0.0.0-20240221224432-82ca36839d55/LICENSE: MIT License @@ -10982,11 +10984,11 @@ SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/rogpeppe/go-internal -Version : v1.13.1 -Time : 2024-09-23T11:44:11Z +Version : v1.12.0 +Time : 2023-12-13T11:29:26Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/github.com/rogpeppe/go-internal@v1.13.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/rogpeppe/go-internal@v1.12.0/LICENSE: Copyright (c) 2018 The Go Authors. All rights reserved. @@ -12164,11 +12166,11 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/tklauser/go-sysconf -Version : v0.3.12 -Time : 2023-08-05T05:20:10Z +Version : v0.3.14 +Time : 2024-04-25T08:30:10Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/github.com/tklauser/go-sysconf@v0.3.12/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/tklauser/go-sysconf@v0.3.14/LICENSE: BSD 3-Clause License @@ -12203,11 +12205,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : github.com/tklauser/numcpus -Version : v0.6.1 -Time : 2023-05-16T12:05:20Z +Version : v0.9.0 +Time : 2024-10-04T15:49:10Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.6.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/tklauser/numcpus@v0.9.0/LICENSE: Apache License @@ -13021,11 +13023,11 @@ SOFTWARE. -------------------------------------------------------------------------------- #### Module : github.com/yuin/goldmark -Version : v1.2.1 -Time : 2020-07-30T13:33:42Z +Version : v1.4.13 +Time : 2022-07-09T07:22:17Z Licence : MIT -Contents of probable licence file $GOMODCACHE/github.com/yuin/goldmark@v1.2.1/LICENSE: +Contents of probable licence file $GOMODCACHE/github.com/yuin/goldmark@v1.4.13/LICENSE: MIT License @@ -13321,6 +13323,217 @@ Contents of probable licence file $GOMODCACHE/go.mongodb.org/mongo-driver@v1.11. limitations under the License. +-------------------------------------------------------------------------------- +#### Module : go.opentelemetry.io/auto/sdk +Version : v1.1.0 +Time : 2024-12-05T17:49:43Z +Licence : Apache-2.0 + +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/auto/sdk@v1.1.0/LICENSE: + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + + -------------------------------------------------------------------------------- #### Module : go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp Version : v0.49.0 @@ -13534,11 +13747,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/contrib/instru -------------------------------------------------------------------------------- #### Module : go.opentelemetry.io/otel -Version : v1.28.0 -Time : 2024-07-02T20:29:45Z +Version : v1.33.0 +Time : 2024-12-12T17:54:13Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.28.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel@v1.33.0/LICENSE: Apache License Version 2.0, January 2004 @@ -13956,11 +14169,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/exporters -------------------------------------------------------------------------------- #### Module : go.opentelemetry.io/otel/metric -Version : v1.28.0 -Time : 2024-07-02T20:29:45Z +Version : v1.33.0 +Time : 2024-12-12T17:54:13Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.28.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/metric@v1.33.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14378,11 +14591,11 @@ Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/sdk@v1.24 -------------------------------------------------------------------------------- #### Module : go.opentelemetry.io/otel/trace -Version : v1.28.0 -Time : 2024-07-02T20:29:45Z +Version : v1.33.0 +Time : 2024-12-12T17:54:13Z Licence : Apache-2.0 -Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.28.0/LICENSE: +Contents of probable licence file $GOMODCACHE/go.opentelemetry.io/otel/trace@v1.33.0/LICENSE: Apache License Version 2.0, January 2004 @@ -14705,11 +14918,11 @@ THE SOFTWARE. -------------------------------------------------------------------------------- #### Module : golang.org/x/crypto -Version : v0.31.0 -Time : 2024-12-11T17:50:49Z +Version : v0.32.0 +Time : 2025-01-06T14:44:30Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.31.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/crypto@v0.32.0/LICENSE: Copyright 2009 The Go Authors. @@ -14890,11 +15103,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : golang.org/x/sys -Version : v0.28.0 -Time : 2024-12-03T18:44:20Z +Version : v0.29.0 +Time : 2024-12-26T16:00:01Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.28.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/sys@v0.29.0/LICENSE: Copyright 2009 The Go Authors. @@ -14927,11 +15140,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : golang.org/x/term -Version : v0.27.0 -Time : 2024-12-04T16:04:05Z +Version : v0.28.0 +Time : 2025-01-05T01:14:59Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.27.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/term@v0.28.0/LICENSE: Copyright 2009 The Go Authors. @@ -15038,11 +15251,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -------------------------------------------------------------------------------- #### Module : golang.org/x/tools -Version : v0.27.0 -Time : 2024-11-08T16:44:01Z +Version : v0.29.0 +Time : 2025-01-06T17:23:12Z Licence : BSD-3-Clause -Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.27.0/LICENSE: +Contents of probable licence file $GOMODCACHE/golang.org/x/tools@v0.29.0/LICENSE: Copyright 2009 The Go Authors. From 4ffb5c9d70f0c6f0884adbaa739049990458ec6f Mon Sep 17 00:00:00 2001 From: Przemyslaw Delewski <102958445+pdelewski@users.noreply.github.com> Date: Wed, 15 Jan 2025 17:08:51 +0100 Subject: [PATCH 5/6] Fixing race condition (#1190) --- quesma/v2/core/quesma_builder.go | 2 +- quesma/v2/core/quesma_pipeline.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/quesma/v2/core/quesma_builder.go b/quesma/v2/core/quesma_builder.go index 6780cb7d9..da691fcdf 100644 --- a/quesma/v2/core/quesma_builder.go +++ b/quesma/v2/core/quesma_builder.go @@ -145,7 +145,7 @@ func (quesma *Quesma) buildInternal() (QuesmaBuilder, error) { if info.pipelineIndex == pipelineIndex && info.connIndex == connIndex { continue } - quesma.dependencies.Logger().Info().Msgf("Sharing frontend connector %v with %v", sharedFc.InstanceName(), conn.InstanceName()) + quesma.dependencies.Logger().Info().Msgf("Sharing frontend connector %p with %p", sharedFc, pipeline.GetFrontendConnectors()[connIndex]) pipeline.GetFrontendConnectors()[connIndex] = sharedFc } } diff --git a/quesma/v2/core/quesma_pipeline.go b/quesma/v2/core/quesma_pipeline.go index f8d85f682..6afc1aa33 100644 --- a/quesma/v2/core/quesma_pipeline.go +++ b/quesma/v2/core/quesma_pipeline.go @@ -70,7 +70,7 @@ func (p *Pipeline) Start() { // because we are copying routing table from all connectors // however, bind error remains for _, conn := range p.FrontendConnectors { - p.logger.Info().Msgf("Starting frontend connector %s", conn) + p.logger.Info().Msgf("Starting frontend connector %s", conn.GetEndpoint()) go conn.Listen() } } From e44f0afc1cd52d7f946982e40321f8f99db4db0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafa=C5=82=20Strzali=C5=84ski?= Date: Thu, 16 Jan 2025 12:20:03 +0100 Subject: [PATCH 6/6] Schema registry refactoring (#1187) This PR adds/changes: - notifications triggered by table discovery or table change - schema registry caching - simplified locking strategy - cache invalidation on table discovery --- quesma/clickhouse/table_discovery.go | 46 ++++++ quesma/ingest/common_table_test.go | 2 + quesma/ingest/processor.go | 2 +- quesma/main.go | 2 + ...icsearch_to_clickhouse_ingest_processor.go | 1 + ...ticsearch_to_clickhouse_query_processor.go | 1 + quesma/quesma/router_test.go | 7 +- quesma/quesma/schema_transformer_test.go | 16 +- quesma/quesma/types/messages.go | 10 ++ quesma/schema/registry.go | 138 ++++++++++++++---- quesma/schema/registry_test.go | 11 +- quesma/schema/static_registry.go | 3 + quesma/table_resolver/table_resolver.go | 14 +- 13 files changed, 211 insertions(+), 42 deletions(-) create mode 100644 quesma/quesma/types/messages.go diff --git a/quesma/clickhouse/table_discovery.go b/quesma/clickhouse/table_discovery.go index 6a73c3b4f..b77792fc7 100644 --- a/quesma/clickhouse/table_discovery.go +++ b/quesma/clickhouse/table_discovery.go @@ -11,11 +11,13 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/persistence" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/QuesmaOrg/quesma/quesma/util" quesma_api "github.com/QuesmaOrg/quesma/quesma/v2/core" "github.com/goccy/go-json" "strings" + "sync" "sync/atomic" "time" ) @@ -34,12 +36,15 @@ func (d DbKind) String() string { type TableDiscovery interface { ReloadTableDefinitions() TableDefinitions() *TableMap + AddTable(tableName string, table *Table) TableDefinitionsFetchError() error LastAccessTime() time.Time LastReloadTime() time.Time ForceReloadCh() <-chan chan<- struct{} AutodiscoveryEnabled() bool + + RegisterTablesReloadListener(ch chan<- types.ReloadMessage) } type tableDiscovery struct { @@ -51,6 +56,9 @@ type tableDiscovery struct { forceReloadCh chan chan<- struct{} ReloadTablesError error virtualTableStorage persistence.JSONDatabase + + reloadObserversMutex sync.Mutex + reloadObservers []chan<- types.ReloadMessage } type columnMetadata struct { @@ -79,6 +87,10 @@ type TableDiscoveryTableProviderAdapter struct { TableDiscovery } +func (t TableDiscoveryTableProviderAdapter) RegisterTablesReloadListener(ch chan<- types.ReloadMessage) { + t.TableDiscovery.RegisterTablesReloadListener(ch) +} + func (t TableDiscoveryTableProviderAdapter) TableDefinitions() map[string]schema.Table { // here we filter out our internal columns @@ -125,6 +137,31 @@ func NewTableDiscoveryWith(cfg *config.QuesmaConfiguration, dbConnPool quesma_ap return result } +func (td *tableDiscovery) AddTable(tableName string, table *Table) { + td.tableDefinitions.Load().Store(tableName, table) + td.notifyObservers() +} + +func (td *tableDiscovery) RegisterTablesReloadListener(ch chan<- types.ReloadMessage) { + td.reloadObserversMutex.Lock() + defer td.reloadObserversMutex.Unlock() + td.reloadObservers = append(td.reloadObservers, ch) +} + +func (td *tableDiscovery) notifyObservers() { + + td.reloadObserversMutex.Lock() + defer td.reloadObserversMutex.Unlock() + + msg := types.ReloadMessage{Timestamp: time.Now()} + for _, observer := range td.reloadObservers { + fmt.Println("Sending message to observer", observer) + go func() { + observer <- msg + }() + } +} + func (td *tableDiscovery) TableDefinitionsFetchError() error { return td.ReloadTablesError } @@ -178,6 +215,8 @@ func (td *tableDiscovery) ReloadTableDefinitions() { td.ReloadTablesError = nil td.populateTableDefinitions(configuredTables, databaseName, td.cfg) + + td.notifyObservers() } func (td *tableDiscovery) readVirtualTables(configuredTables map[string]discoveredTable) map[string]discoveredTable { @@ -634,6 +673,9 @@ func NewEmptyTableDiscovery() *EmptyTableDiscovery { } } +func (td *EmptyTableDiscovery) RegisterTablesReloadListener(ch chan<- types.ReloadMessage) { +} + func (td *EmptyTableDiscovery) ReloadTableDefinitions() { } @@ -660,3 +702,7 @@ func (td *EmptyTableDiscovery) ForceReloadCh() <-chan chan<- struct{} { func (td *EmptyTableDiscovery) AutodiscoveryEnabled() bool { return td.Autodiscovery } + +func (td *EmptyTableDiscovery) AddTable(tableName string, table *Table) { + td.TableMap.Store(tableName, table) +} diff --git a/quesma/ingest/common_table_test.go b/quesma/ingest/common_table_test.go index 6c0573127..6357703b5 100644 --- a/quesma/ingest/common_table_test.go +++ b/quesma/ingest/common_table_test.go @@ -191,6 +191,8 @@ func TestIngestToCommonTable(t *testing.T) { tableDisco := clickhouse.NewTableDiscovery(quesmaConfig, db, virtualTableStorage) schemaRegistry := schema.NewSchemaRegistry(clickhouse.TableDiscoveryTableProviderAdapter{TableDiscovery: tableDisco}, quesmaConfig, clickhouse.SchemaTypeAdapter{}) + schemaRegistry.Start() + defer schemaRegistry.Stop() resolver := table_resolver.NewEmptyTableResolver() diff --git a/quesma/ingest/processor.go b/quesma/ingest/processor.go index d974d8664..243b86a68 100644 --- a/quesma/ingest/processor.go +++ b/quesma/ingest/processor.go @@ -962,7 +962,7 @@ func (ip *IngestProcessor) AddTableIfDoesntExist(table *chLib.Table) bool { logger.Error().Msgf("error storing virtual table: %v", err) } } - ip.tableDiscovery.TableDefinitions().Store(table.Name, table) + ip.tableDiscovery.AddTable(table.Name, table) return true } wasntCreated := !t.Created diff --git a/quesma/main.go b/quesma/main.go index eb730c84a..c940110a7 100644 --- a/quesma/main.go +++ b/quesma/main.go @@ -107,6 +107,7 @@ func main() { virtualTableStorage := persistence.NewElasticJSONDatabase(cfg.Elasticsearch, common_table.VirtualTableElasticIndexName) tableDisco := clickhouse.NewTableDiscovery(&cfg, connectionPool, virtualTableStorage) schemaRegistry := schema.NewSchemaRegistry(clickhouse.TableDiscoveryTableProviderAdapter{TableDiscovery: tableDisco}, &cfg, clickhouse.SchemaTypeAdapter{}) + schemaRegistry.Start() im := elasticsearch.NewIndexManagement(cfg.Elasticsearch) @@ -146,6 +147,7 @@ func main() { ctx, cancel := context.WithTimeout(context.Background(), 2*time.Second) defer cancel() + schemaRegistry.Stop() feature.NotSupportedLogger.Stop() phoneHomeAgent.Stop(ctx) lm.Stop() diff --git a/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go b/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go index 84a7a9402..f13eb8ed8 100644 --- a/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go +++ b/quesma/processors/es_to_ch_ingest/elasticsearch_to_clickhouse_ingest_processor.go @@ -104,6 +104,7 @@ func (p *ElasticsearchToClickHouseIngestProcessor) prepareTemporaryIngestProcess virtualTableStorage := persistence.NewElasticJSONDatabase(esBackendConn.GetConfig(), common_table.VirtualTableElasticIndexName) tableDisco := clickhouse.NewTableDiscovery(oldQuesmaConfig, connectionPool, virtualTableStorage) schemaRegistry := schema.NewSchemaRegistry(clickhouse.TableDiscoveryTableProviderAdapter{TableDiscovery: tableDisco}, oldQuesmaConfig, clickhouse.SchemaTypeAdapter{}) + schemaRegistry.Start() dummyTableResolver := table_resolver.NewDummyTableResolver() diff --git a/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go b/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go index 73ac31e9b..c7d50567a 100644 --- a/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go +++ b/quesma/processors/es_to_ch_query/elasticsearch_to_clickhouse_query_processor.go @@ -98,6 +98,7 @@ func (p *ElasticsearchToClickHouseQueryProcessor) prepareTemporaryQueryProcessor virtualTableStorage := persistence.NewElasticJSONDatabase(esBackendConn.GetConfig(), common_table.VirtualTableElasticIndexName) tableDisco := clickhouse.NewTableDiscovery(oldQuesmaConfig, connectionPool, virtualTableStorage) schemaRegistry := schema.NewSchemaRegistry(clickhouse.TableDiscoveryTableProviderAdapter{TableDiscovery: tableDisco}, oldQuesmaConfig, clickhouse.SchemaTypeAdapter{}) + schemaRegistry.Start() logManager := clickhouse.NewEmptyLogManager(oldQuesmaConfig, connectionPool, phoneHomeAgent, tableDisco) logManager.Start() diff --git a/quesma/quesma/router_test.go b/quesma/quesma/router_test.go index 1ae229028..ce45251cb 100644 --- a/quesma/quesma/router_test.go +++ b/quesma/quesma/router_test.go @@ -280,7 +280,12 @@ func TestConfigureRouter(t *testing.T) { }, } tr := TestTableResolver{} - testRouter := ConfigureRouter(cfg, schema.NewSchemaRegistry(fixedTableProvider{}, cfg, clickhouse.SchemaTypeAdapter{}), &clickhouse.LogManager{}, &ingest.IngestProcessor{}, &ui.QuesmaManagementConsole{}, telemetry.NewPhoneHomeAgent(cfg, nil, ""), &QueryRunner{}, tr, nil) + + schemaRegistry := schema.NewSchemaRegistry(fixedTableProvider{}, cfg, clickhouse.SchemaTypeAdapter{}) + schemaRegistry.Start() + defer schemaRegistry.Stop() + + testRouter := ConfigureRouter(cfg, schemaRegistry, &clickhouse.LogManager{}, &ingest.IngestProcessor{}, &ui.QuesmaManagementConsole{}, telemetry.NewPhoneHomeAgent(cfg, nil, ""), &QueryRunner{}, tr, nil) tests := []struct { path string diff --git a/quesma/quesma/schema_transformer_test.go b/quesma/quesma/schema_transformer_test.go index 2ecff921f..bf2eace13 100644 --- a/quesma/quesma/schema_transformer_test.go +++ b/quesma/quesma/schema_transformer_test.go @@ -6,6 +6,7 @@ import ( "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/model" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/stretchr/testify/assert" "strconv" @@ -19,8 +20,8 @@ type fixedTableProvider struct { func (f fixedTableProvider) TableDefinitions() map[string]schema.Table { return f.tables } - -func (f fixedTableProvider) AutodiscoveryEnabled() bool { return false } +func (f fixedTableProvider) AutodiscoveryEnabled() bool { return false } +func (f fixedTableProvider) RegisterTablesReloadListener(chan<- types.ReloadMessage) {} func Test_ipRangeTransform(t *testing.T) { const isIPAddressInRangePrimitive = "isIPAddressInRange" @@ -86,6 +87,8 @@ func Test_ipRangeTransform(t *testing.T) { TableName: "kibana_sample_data_logs_nested", FieldName: "nested.clientip"}: "nested_clientip", } s := schema.NewSchemaRegistry(tableProvider, &cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() transform := NewSchemaCheckPass(&cfg, tableDiscovery, defaultSearchAfterStrategy) s.UpdateFieldEncodings(fieldEncodings) @@ -704,6 +707,8 @@ func TestApplyPhysicalFromExpression(t *testing.T) { td.Store(tableDefinition.Name, &tableDefinition) s := schema.NewSchemaRegistry(tableDiscovery, &cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() transform := NewSchemaCheckPass(&config.QuesmaConfiguration{IndexConfig: indexConfig}, nil, defaultSearchAfterStrategy) tests := []struct { @@ -964,6 +969,8 @@ func TestFullTextFields(t *testing.T) { } s := schema.NewSchemaRegistry(tableDiscovery, &cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() transform := NewSchemaCheckPass(&config.QuesmaConfiguration{IndexConfig: indexConfig}, nil, defaultSearchAfterStrategy) indexSchema, ok := s.FindSchema("test") @@ -1071,6 +1078,9 @@ func Test_applyMatchOperator(t *testing.T) { } s := schema.NewSchemaRegistry(tableDiscovery, &cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() + transform := NewSchemaCheckPass(&cfg, nil, defaultSearchAfterStrategy) indexSchema, ok := s.FindSchema("test") @@ -1171,6 +1181,8 @@ func Test_checkAggOverUnsupportedType(t *testing.T) { } s := schema.NewSchemaRegistry(tableDiscovery, &cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() transform := NewSchemaCheckPass(&cfg, nil, defaultSearchAfterStrategy) indexSchema, ok := s.FindSchema("test") diff --git a/quesma/quesma/types/messages.go b/quesma/quesma/types/messages.go new file mode 100644 index 000000000..e7e042cd3 --- /dev/null +++ b/quesma/quesma/types/messages.go @@ -0,0 +1,10 @@ +// Copyright Quesma, licensed under the Elastic License 2.0. +// SPDX-License-Identifier: Elastic-2.0 + +package types + +import "time" + +type ReloadMessage struct { + Timestamp time.Time +} diff --git a/quesma/schema/registry.go b/quesma/schema/registry.go index cc8a9c02a..a4fb4a3e8 100644 --- a/quesma/schema/registry.go +++ b/quesma/schema/registry.go @@ -6,14 +6,20 @@ import ( "github.com/QuesmaOrg/quesma/quesma/comment_metadata" "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" + "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/util" "sync" + "time" ) // TODO we should rethink naming and types used in this package type ( Registry interface { + Start() + Stop() + AllSchemas() map[IndexName]Schema FindSchema(name IndexName) (Schema, bool) UpdateFieldsOrigins(name IndexName, fields map[FieldName]FieldSource) @@ -28,20 +34,26 @@ type ( } EncodedFieldName string schemaRegistry struct { + sync.RWMutex // this lock is used to protect all the fields below + // locking is done in public methods only to avoid deadlocks + // index configuration overrides always take precedence indexConfiguration *map[string]config.IndexConfiguration dataSourceTableProvider TableProvider dataSourceTypeAdapter typeAdapter dynamicConfiguration map[string]Table - fieldEncodingsLock sync.RWMutex fieldEncodings map[FieldEncodingKey]EncodedFieldName - fieldOriginsLock sync.RWMutex fieldOrigins map[IndexName]map[FieldName]FieldSource + + cachedSchemas map[IndexName]Schema + + doneCh chan struct{} } typeAdapter interface { Convert(string) (QuesmaType, bool) } TableProvider interface { + RegisterTablesReloadListener(chan<- types.ReloadMessage) TableDefinitions() map[string]Table AutodiscoveryEnabled() bool } @@ -58,13 +70,13 @@ type ( func (s *schemaRegistry) getInternalToPublicFieldEncodings(tableName string) map[EncodedFieldName]string { fieldsEncodingsPerIndex := make(map[string]EncodedFieldName) - s.fieldEncodingsLock.RLock() + for key, value := range s.fieldEncodings { if key.TableName == tableName { fieldsEncodingsPerIndex[key.FieldName] = EncodedFieldName(value) } } - s.fieldEncodingsLock.RUnlock() + internalToPublicFieldsEncodings := make(map[EncodedFieldName]string) for key, value := range fieldsEncodingsPerIndex { @@ -74,6 +86,61 @@ func (s *schemaRegistry) getInternalToPublicFieldEncodings(tableName string) map return internalToPublicFieldsEncodings } +func (s *schemaRegistry) invalidateCache() { + s.cachedSchemas = nil +} + +func (s *schemaRegistry) Start() { + + notificationChannel := make(chan types.ReloadMessage, 1) + + s.dataSourceTableProvider.RegisterTablesReloadListener(notificationChannel) + + protectedReload := func() { + defer recovery.LogPanic() + s.Lock() + defer s.Unlock() + + s.invalidateCache() + } + + go func() { + // reload schemas every 5 minutes + // table_discovery can be disabled, so we need to reload schemas periodically just in case + ticker := time.NewTicker(5 * time.Minute) + for { + select { + case <-notificationChannel: + protectedReload() + + case <-ticker.C: + protectedReload() + + case <-s.doneCh: + return + } + } + }() +} + +func (s *schemaRegistry) Stop() { + s.doneCh <- struct{}{} +} + +func (s *schemaRegistry) loadOrGetSchemas() map[IndexName]Schema { + + if s.cachedSchemas == nil { + schema, err := s.loadSchemas() + if err != nil { + logger.Error().Err(err).Msg("error loading schema") + return make(map[IndexName]Schema) + } + s.cachedSchemas = schema + } + + return s.cachedSchemas +} + func (s *schemaRegistry) loadSchemas() (map[IndexName]Schema, error) { definitions := s.dataSourceTableProvider.TableDefinitions() schemas := make(map[IndexName]Schema) @@ -126,25 +193,27 @@ func (s *schemaRegistry) populateSchemaFromDynamicConfiguration(indexName string } func (s *schemaRegistry) AllSchemas() map[IndexName]Schema { - if schemas, err := s.loadSchemas(); err != nil { - logger.Error().Msgf("error loading schemas: %v", err) - return make(map[IndexName]Schema) - } else { - return schemas - } + s.Lock() + defer s.Unlock() + + return s.loadOrGetSchemas() } func (s *schemaRegistry) FindSchema(name IndexName) (Schema, bool) { - if schemas, err := s.loadSchemas(); err != nil { - logger.Error().Msgf("error loading schemas: %v", err) - return Schema{}, false - } else { - schema, found := schemas[name] - return schema, found - } + s.Lock() + defer s.Unlock() + + schemas := s.loadOrGetSchemas() + + schema, found := schemas[name] + return schema, found + } func (s *schemaRegistry) UpdateDynamicConfiguration(name IndexName, table Table) { + s.Lock() + defer s.Unlock() + s.dynamicConfiguration[name.AsString()] = table dynamicEncodings := make(map[FieldEncodingKey]EncodedFieldName) for _, column := range table.Columns { @@ -152,20 +221,29 @@ func (s *schemaRegistry) UpdateDynamicConfiguration(name IndexName, table Table) // Otherwise, they will be populated only based on ingested data which might not contain all the fields dynamicEncodings[FieldEncodingKey{TableName: name.AsString(), FieldName: column.Name}] = EncodedFieldName(util.FieldToColumnEncoder(column.Name)) } - s.UpdateFieldEncodings(dynamicEncodings) + s.updateFieldEncodingsInternal(dynamicEncodings) + s.invalidateCache() } -func (s *schemaRegistry) UpdateFieldEncodings(encodings map[FieldEncodingKey]EncodedFieldName) { - s.fieldEncodingsLock.Lock() - defer s.fieldEncodingsLock.Unlock() +func (s *schemaRegistry) updateFieldEncodingsInternal(encodings map[FieldEncodingKey]EncodedFieldName) { + for key, value := range encodings { s.fieldEncodings[key] = EncodedFieldName(value) } } +func (s *schemaRegistry) UpdateFieldEncodings(encodings map[FieldEncodingKey]EncodedFieldName) { + s.Lock() + defer s.Unlock() + + s.updateFieldEncodingsInternal(encodings) + s.invalidateCache() +} + func (s *schemaRegistry) GetFieldEncodings() map[FieldEncodingKey]EncodedFieldName { - s.fieldEncodingsLock.RLock() - defer s.fieldEncodingsLock.RUnlock() + s.RLock() + defer s.RUnlock() + fieldEncodings := make(map[FieldEncodingKey]EncodedFieldName) for key, value := range s.fieldEncodings { fieldEncodings[key] = EncodedFieldName(value) @@ -175,13 +253,16 @@ func (s *schemaRegistry) GetFieldEncodings() map[FieldEncodingKey]EncodedFieldNa } func NewSchemaRegistry(tableProvider TableProvider, configuration *config.QuesmaConfiguration, dataSourceTypeAdapter typeAdapter) Registry { - return &schemaRegistry{ + res := &schemaRegistry{ indexConfiguration: &configuration.IndexConfig, dataSourceTableProvider: tableProvider, dataSourceTypeAdapter: dataSourceTypeAdapter, dynamicConfiguration: make(map[string]Table), + cachedSchemas: nil, fieldEncodings: make(map[FieldEncodingKey]EncodedFieldName), + doneCh: make(chan struct{}), } + return res } func (s *schemaRegistry) populateSchemaFromStaticConfiguration(indexConfiguration config.IndexConfiguration, fields map[FieldName]Field) { @@ -283,7 +364,7 @@ func (s *schemaRegistry) removeGeoPhysicalFields(fields map[FieldName]Field) { } func (s *schemaRegistry) populateFieldsOrigins(indexName string, fields map[FieldName]Field) { - s.fieldOriginsLock.RLock() + if fieldOrigins, ok := s.fieldOrigins[IndexName(indexName)]; ok { for fieldName, field := range fields { if origin, ok := fieldOrigins[field.InternalPropertyName]; ok { @@ -292,12 +373,13 @@ func (s *schemaRegistry) populateFieldsOrigins(indexName string, fields map[Fiel } } } - s.fieldOriginsLock.RUnlock() + } func (s *schemaRegistry) UpdateFieldsOrigins(name IndexName, fields map[FieldName]FieldSource) { - s.fieldOriginsLock.Lock() - defer s.fieldOriginsLock.Unlock() + s.Lock() + defer s.Unlock() + if s.fieldOrigins == nil { s.fieldOrigins = make(map[IndexName]map[FieldName]FieldSource) } diff --git a/quesma/schema/registry_test.go b/quesma/schema/registry_test.go index 684b765ab..3970e115c 100644 --- a/quesma/schema/registry_test.go +++ b/quesma/schema/registry_test.go @@ -5,6 +5,7 @@ package schema_test import ( "github.com/QuesmaOrg/quesma/quesma/clickhouse" "github.com/QuesmaOrg/quesma/quesma/quesma/config" + "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/schema" "github.com/k0kubun/pp" "github.com/stretchr/testify/assert" @@ -264,6 +265,9 @@ func Test_schemaRegistry_FindSchema(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { s := schema.NewSchemaRegistry(tt.tableDiscovery, &tt.cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() + resultSchema, resultFound := s.FindSchema(tt.tableName) if resultFound != tt.found { t.Errorf("FindSchema() got1 = %v, want %v", resultFound, tt.found) @@ -300,6 +304,8 @@ func Test_schemaRegistry_UpdateDynamicConfiguration(t *testing.T) { }} s := schema.NewSchemaRegistry(tableDiscovery, &cfg, clickhouse.SchemaTypeAdapter{}) + s.Start() + defer s.Stop() expectedSchema := schema.NewSchema(map[schema.FieldName]schema.Field{ "message": {PropertyName: "message", InternalPropertyName: "message", Type: schema.QuesmaTypeKeyword, InternalPropertyType: "String"}, @@ -341,5 +347,6 @@ type fixedTableProvider struct { tables map[string]schema.Table } -func (f fixedTableProvider) TableDefinitions() map[string]schema.Table { return f.tables } -func (f fixedTableProvider) AutodiscoveryEnabled() bool { return false } +func (f fixedTableProvider) TableDefinitions() map[string]schema.Table { return f.tables } +func (f fixedTableProvider) AutodiscoveryEnabled() bool { return false } +func (f fixedTableProvider) RegisterTablesReloadListener(chan<- types.ReloadMessage) {} diff --git a/quesma/schema/static_registry.go b/quesma/schema/static_registry.go index 061db58f6..a5488cfa2 100644 --- a/quesma/schema/static_registry.go +++ b/quesma/schema/static_registry.go @@ -58,3 +58,6 @@ func (e *StaticRegistry) GetFieldEncodings() map[FieldEncodingKey]EncodedFieldNa func (e *StaticRegistry) UpdateFieldsOrigins(name IndexName, fields map[FieldName]FieldSource) { } + +func (e *StaticRegistry) Start() {} +func (e *StaticRegistry) Stop() {} diff --git a/quesma/table_resolver/table_resolver.go b/quesma/table_resolver/table_resolver.go index fa75b68c2..a21408022 100644 --- a/quesma/table_resolver/table_resolver.go +++ b/quesma/table_resolver/table_resolver.go @@ -10,10 +10,10 @@ import ( "github.com/QuesmaOrg/quesma/quesma/logger" "github.com/QuesmaOrg/quesma/quesma/quesma/config" "github.com/QuesmaOrg/quesma/quesma/quesma/recovery" + "github.com/QuesmaOrg/quesma/quesma/quesma/types" "github.com/QuesmaOrg/quesma/quesma/v2/core" "sort" "sync" - "time" ) type tableResolver interface { @@ -150,12 +150,6 @@ func (r *tableRegistryImpl) updateIndexes() { logger.Info().Msgf("Index registry updating state.") - // TODO how to interact with the table discovery ? - // right now we enforce the reload of the table definitions - // schema registry is doing the same - // we should inject list of tables into the resolver - r.tableDiscovery.ReloadTableDefinitions() - tableMap := r.tableDiscovery.TableDefinitions() clickhouseIndexes := make(map[string]table) @@ -209,6 +203,10 @@ func (r *tableRegistryImpl) Stop() { } func (r *tableRegistryImpl) Start() { + + notificationChannel := make(chan types.ReloadMessage, 1) + r.tableDiscovery.RegisterTablesReloadListener(notificationChannel) + go func() { defer recovery.LogPanic() logger.Info().Msg("Table resolve started.") @@ -217,7 +215,7 @@ func (r *tableRegistryImpl) Start() { select { case <-r.ctx.Done(): return - case <-time.After(1 * time.Minute): + case <-notificationChannel: r.updateState() } }