Skip to content

Commit 8445479

Browse files
authored
feat/add singlestore source connector (#197)
* add singlestore source connector * pull all needed docker images at the beginning of the CI job * Add docker logs to error output * delete images after docker compose * shell tidy * bump the github runner for src/dest integration tests * fix minio docker compose path * don't prematurely pull all images * Fix changelog typo * replace deprecated __fields__ with model_fields()
1 parent 5d679fa commit 8445479

File tree

68 files changed

+915
-337
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+915
-337
lines changed

.github/workflows/e2e.yml

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
make integration-test-embedders
7070
7171
source_connectors_integration_test:
72-
runs-on: ubuntu-latest
72+
runs-on: ubuntu-latest-m
7373
needs: [ setup ]
7474
steps:
7575
- uses: 'actions/checkout@v4'
@@ -84,6 +84,10 @@ jobs:
8484
uses: ./.github/actions/base-cache
8585
with:
8686
python-version: "3.10"
87+
- name: Setup up docker
88+
run: |
89+
sudo make install-docker-compose
90+
docker compose version
8791
- name: Run Integration Tests
8892
env:
8993
DATABRICKS_HOST: ${{secrets.DATABRICKS_HOST}}
@@ -92,13 +96,11 @@ jobs:
9296
DATABRICKS_CLIENT_SECRET: ${{secrets.DATABRICKS_CLIENT_SECRET}}
9397
run : |
9498
source .venv/bin/activate
95-
sudo make install-docker-compose
96-
docker compose version
9799
make install-test
98100
make integration-test-connectors-src
99101
100102
destination_connectors_integration_test:
101-
runs-on: ubuntu-latest
103+
runs-on: ubuntu-latest-m
102104
needs: [ setup ]
103105
steps:
104106
- uses: 'actions/checkout@v4'
@@ -113,6 +115,10 @@ jobs:
113115
uses: ./.github/actions/base-cache
114116
with:
115117
python-version: "3.10"
118+
- name: Setup up docker
119+
run: |
120+
sudo make install-docker-compose
121+
docker compose version
116122
- name: Run Integration Tests
117123
env:
118124
DATABRICKS_HOST: ${{secrets.DATABRICKS_HOST}}
@@ -123,8 +129,6 @@ jobs:
123129
S3_INGEST_TEST_SECRET_KEY: ${{ secrets.S3_INGEST_TEST_SECRET_KEY }}
124130
run : |
125131
source .venv/bin/activate
126-
sudo make install-docker-compose
127-
docker compose version
128132
make install-test
129133
make integration-test-connectors-dest
130134

CHANGELOG.md

Lines changed: 6 additions & 2 deletions

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ integration-test-embedders:
141141
integration-test-connectors-src:
142142
PYTHONPATH=. pytest --tags source -sv test/integration/connectors
143143

144+
144145
.PHONY: integration-test-connectors-dest
145146
integration-test-connectors-dest:
146147
PYTHONPATH=. pytest --tags destination -sv test/integration/connectors

test_e2e/env_setup/singlestore/docker-compose.yml renamed to test/integration/connectors/env_setup/sql/singlestore/destination/docker-compose.yaml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,3 @@ services:
1111
- ROOT_PASSWORD=password
1212
volumes:
1313
- ./schema.sql:/init.sql
14-
15-
# Allow docker compose up --wait to exit only when singlestore is healthy
16-
wait:
17-
image: hello-world:latest
18-
container_name: singlestore-waiter
19-
depends_on:
20-
singlestore:
21-
condition: service_healthy

test_e2e/env_setup/singlestore/schema.sql renamed to test/integration/connectors/env_setup/sql/singlestore/destination/schema.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CREATE DATABASE ingest_test;
22
USE ingest_test;
33

44
CREATE TABLE elements (
5-
id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
5+
id TEXT PRIMARY KEY NOT NULL,
66
element_id TEXT,
77
text TEXT,
88
embeddings Vector(384),

0 commit comments

Comments
 (0)