Merge branch 'main' into rate-aggr

QuesmaOrg · Dec 27, 2024 · 808aaa0 · 808aaa0
2 parents 8e44e64 + 31a39e1
commit 808aaa0
Show file tree

Hide file tree

Showing 190 changed files with 9,153 additions and 4,018 deletions.
diff --git a/.github/workflows/generate-notice.yml b/.github/workflows/generate-notice.yml
@@ -37,7 +37,7 @@ jobs:
         run: |
           go mod tidy
           go mod download all
-          go list -m -json all | go-licence-detector -includeIndirect -noticeTemplate=../.github/go-licence-detector/templates/NOTICE.MD.tmpl -noticeOut=../NOTICE.MD -depsTemplate=../.github/go-licence-detector/templates/dependencies.asciidoc.tmpl -depsOut=dependencies.asciidoc -overrides=../.github/go-licence-detector/overrides.ndjson
+          go list -m -json all | jq 'select(.Path != "quesma_v2")' | go-licence-detector -includeIndirect -noticeTemplate=../.github/go-licence-detector/templates/NOTICE.MD.tmpl -noticeOut=../NOTICE.MD -depsTemplate=../.github/go-licence-detector/templates/dependencies.asciidoc.tmpl -depsOut=dependencies.asciidoc -overrides=../.github/go-licence-detector/overrides.ndjson
           rm dependencies.asciidoc
 
       - name: Print NOTICE.MD

diff --git a/.gitignore b/.gitignore
@@ -28,3 +28,4 @@ bin/.running-docker-compose
 docs/public/node_modules
 docs/public/docs/.vitepress/cache/deps
 docs/public/docs/.vitepress/dist
+helm-chart/quesma-demo/values.yaml
diff --git a/NOTICE.MD b/NOTICE.MD
diff --git a/bin/build-image.sh b/bin/build-image.sh
@@ -7,4 +7,6 @@ QUESMA_BUILD_SHA=$(git rev-parse HEAD)
 QUESMA_BUILD_DATE=$(git --no-pager log -1 --date=format:'%Y-%m-%d' --format="%ad")
 QUESMA_VERSION="development"
 
+export DOCKER_BUILDKIT=1
+
 docker build --build-arg QUESMA_BUILD_DATE="$QUESMA_BUILD_DATE" --build-arg QUESMA_VERSION="$QUESMA_VERSION" --build-arg QUESMA_BUILD_SHA="$QUESMA_BUILD_SHA" -f quesma/Dockerfile -t quesma/quesma:nightly quesma
diff --git a/bin/it.sh b/bin/it.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+# Run integration tests
+set -e
+cd "$(dirname "$0/")/.."
+
+bin/build-image.sh
+
+cd ci/it
+
+go test -v
diff --git a/bin/ut.sh b/bin/ut.sh
@@ -0,0 +1,6 @@
+#!/bin/bash
+# Run unit tests
+set -e
+cd "$(dirname "$0/")/../quesma"
+
+go run gotest.tools/gotestsum@latest --format pkgname-and-test-fails ./...
diff --git a/ci/it/configs/quesma-ab.yml.template b/ci/it/configs/quesma-ab.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: QP
     type: quesma-v1-processor-query

diff --git a/ci/it/configs/quesma-as-transparent-proxy.yml.template b/ci/it/configs/quesma-as-transparent-proxy.yml.template
@@ -14,6 +14,11 @@ backendConnectors:
       url: "http://{{ .elasticsearch_host }}:{{ .elasticsearch_port }}"
       user: elastic
       password: quesmaquesma
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: noop-query-processor
     type: quesma-v1-processor-noop

diff --git a/ci/it/configs/quesma-ingest.yml.template b/ci/it/configs/quesma-ingest.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: my-query-processor
     type: quesma-v1-processor-query

diff --git a/ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template b/ci/it/configs/quesma-now-reads-clickhouse-tables.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: my-query-processor
     type: quesma-v1-processor-query

diff --git a/ci/it/configs/quesma-wildcard-clickhouse.yml.template b/ci/it/configs/quesma-wildcard-clickhouse.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: my-query-processor
     type: quesma-v1-processor-query

diff --git a/ci/it/configs/quesma-wildcard-disabled.yml.template b/ci/it/configs/quesma-wildcard-disabled.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: my-query-processor
     type: quesma-v1-processor-query

diff --git a/ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template b/ci/it/configs/quesma-with-dual-writes-and-common-table.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: QP
     type: quesma-v1-processor-query

diff --git a/ci/it/configs/quesma-with-two-pipelines.yml.template b/ci/it/configs/quesma-with-two-pipelines.yml.template
@@ -18,7 +18,11 @@ backendConnectors:
     type: clickhouse-os
     config:
       url: clickhouse://{{ .clickhouse_host }}:{{ .clickhouse_port }}
-ingestStatistics: true
+logging:
+  path: "logs"
+  level: "info"
+  disableFileLogging: false
+  enableSQLTracing: true
 processors:
   - name: my-query-processor
     type: quesma-v1-processor-query

diff --git a/ci/it/go.mod b/ci/it/go.mod
@@ -1,9 +1,10 @@
 module quesma.com/its
 
-go 1.21.6
+go 1.23.2
 
 require (
 	github.com/ClickHouse/clickhouse-go/v2 v2.20.0
+	github.com/docker/docker v27.1.1+incompatible
 	github.com/stretchr/testify v1.9.0
 	github.com/testcontainers/testcontainers-go v0.33.0
 )
@@ -21,7 +22,6 @@ require (
 	github.com/cpuguy83/dockercfg v0.3.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v27.1.1+incompatible // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -53,17 +53,17 @@ require (
 	github.com/shoenig/go-m1cpu v0.1.6 // indirect
 	github.com/shopspring/decimal v1.3.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/testcontainers/testcontainers-go/modules/clickhouse v0.33.0 // indirect
-	github.com/testcontainers/testcontainers-go/modules/elasticsearch v0.33.0 // indirect
 	github.com/tklauser/go-sysconf v0.3.12 // indirect
 	github.com/tklauser/numcpus v0.6.1 // indirect
 	github.com/yusufpapurcu/wmi v1.2.3 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
 	go.opentelemetry.io/otel v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/crypto v0.24.0 // indirect
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/sys v0.21.0 // indirect
+	golang.org/x/crypto v0.31.0 // indirect
+	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/sys v0.28.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20240318140521-94a12d6c2237 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20240318140521-94a12d6c2237 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )