Skip to content

Commit

Permalink
fix: update dependencies and htap-setup docs (apecloud#147)
Browse files Browse the repository at this point in the history 
* fix: update dependencies and htap-setup docs

* fix: update the tag of github.com/dolthub/go-mysql-server in go.mod
  • Loading branch information
@VWagen1989
VWagen1989 authored Nov 12, 2024
1 parent b13a144 commit eb5c918
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 25 deletions.
5 changes: 5 additions & 0 deletions catalog/index.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,8 @@ func (idx *Index) CanSupportOrderBy(expr sql.Expression) bool {
func (idx *Index) PrefixLengths() []uint16 {
return idx.PrefixLens
}

// IsVector returns whether this index is a vector index
func (idx *Index) IsVector() bool {
return false
}
9 changes: 0 additions & 9 deletions devtools/htap-setup/maxscale/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,6 @@ services:
timeout: 5s
retries: 5

myduck-tmp-fix:
image: mysql:8.0
container_name: htap-myduck-tmp-fix
entrypoint: ["bash", "-c", "until mysql -h myduck -u root -e \"alter user 'lol'@'%' identified by 'lol';\" ; do echo 'Waiting for account to be ready...'; sleep 2; done"]
restart: "no"
depends_on:
myduck:
condition: service_healthy

maxscale:
image: mariadb/maxscale:24.02
container_name: maxscale
Expand Down
9 changes: 0 additions & 9 deletions devtools/htap-setup/proxysql/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,6 @@ services:
timeout: 5s
retries: 5

myduck-tmp-fix:
image: mysql:8
container_name: htap-myduck-tmp-fix
entrypoint: ["bash", "-c", "until mysql -h myduck -u root -e \"alter user 'lol'@'%' identified by 'lol';\" ; do echo 'Waiting for account to be ready...'; sleep 2; done"]
restart: "no"
depends_on:
myduck:
condition: service_healthy

proxysql:
image: proxysql/proxysql:latest
container_name: proxysql
Expand Down
6 changes: 3 additions & 3 deletions devtools/replica-setup/checker.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ check_server_params() {
echo "Checking MySQL server parameters..."

# Retrieve the required MySQL server variables using mysqlsh
result=$(mysqlsh --host="$MYSQL_HOST" --user="$MYSQL_USER" --port="$MYSQL_PORT" --password="$MYSQL_PASSWORD" --sql -e "
result=$(mysqlsh --host="$MYSQL_HOST" --port="$MYSQL_PORT" --user="$MYSQL_USER" --password="$MYSQL_PASSWORD" --sql -e "
SHOW VARIABLES WHERE variable_name IN ('binlog_format', 'enforce_gtid_consistency', 'gtid_mode', 'log_bin');
")

Expand Down Expand Up @@ -64,7 +64,7 @@ check_user_privileges() {
echo "Checking privileges for the current user '$MYSQL_USER'..."

# Check the user grants for the currently authenticated user using mysqlsh
result=$(mysqlsh --host="$MYSQL_HOST" --user="$MYSQL_USER" --password="$MYSQL_PASSWORD" --sql -e "
result=$(mysqlsh --host="$MYSQL_HOST" --port="$MYSQL_PORT" --user="$MYSQL_USER" --password="$MYSQL_PASSWORD" --sql -e "
SHOW GRANTS FOR CURRENT_USER();
")

Expand Down Expand Up @@ -97,7 +97,7 @@ check_mysql_config() {
# Function to check if source MySQL server is empty
check_if_source_mysql_is_empty() {
# Run the query using mysqlsh and capture the output
OUTPUT=$(mysqlsh --uri "$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST" --sql -e "SHOW DATABASES;" 2>/dev/null)
OUTPUT=$(mysqlsh --uri "$MYSQL_USER:$MYSQL_PASSWORD@$MYSQL_HOST:$MYSQL_PORT" --sql -e "SHOW DATABASES;" 2>/dev/null)

check_command "retrieving database list"

Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ require (
github.com/cockroachdb/apd/v3 v3.2.1
github.com/cockroachdb/cockroachdb-parser v0.23.2
github.com/dolthub/doltgresql v0.13.0
github.com/dolthub/go-mysql-server v0.18.2-0.20241106010546-3281d09c1f15
github.com/dolthub/vitess v0.0.0-20241104125316-860772ba6683
github.com/dolthub/go-mysql-server v0.18.2-0.20241112002228-81b13e8034f2
github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9
github.com/go-sql-driver/mysql v1.8.1
github.com/jackc/pgx/v5 v5.7.1
github.com/jmoiron/sqlx v1.4.0
Expand All @@ -26,8 +26,8 @@ require (
)

replace (
github.com/dolthub/go-mysql-server v0.18.2-0.20241106010546-3281d09c1f15 => github.com/fanyang01/go-mysql-server v0.0.0-20241107083514-e7c2ac20ddba
github.com/dolthub/vitess v0.0.0-20241104125316-860772ba6683 => github.com/apecloud/dolt-vitess v0.0.0-20241107081545-d894da3857d8
github.com/dolthub/go-mysql-server v0.18.2-0.20241112002228-81b13e8034f2 => github.com/apecloud/go-mysql-server v0.0.0-20241112031328-30cddba3eea7
github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9 => github.com/apecloud/dolt-vitess v0.0.0-20241112063127-f62e98a9936a
)

require (
Expand Down
8 changes: 8 additions & 0 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ github.com/apache/thrift v0.21.0 h1:tdPmh/ptjE1IJnhbhrcl2++TauVjy242rkV/UzJChnE=
github.com/apache/thrift v0.21.0/go.mod h1:W1H8aR/QRtYNvrPeFXBtobyRkd0/YVhTc6i07XIAgDw=
github.com/apecloud/dolt-vitess v0.0.0-20241107081545-d894da3857d8 h1:OKsyuwps5eKiUa4GHn35O8kq8R+Tf2/iUYNo3f3SoCc=
github.com/apecloud/dolt-vitess v0.0.0-20241107081545-d894da3857d8/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
github.com/apecloud/dolt-vitess v0.0.0-20241112063127-f62e98a9936a h1:2D9spsdHL5yqHqxghc7FrTfknswMbiUCCJ1Ci3WaIPY=
github.com/apecloud/dolt-vitess v0.0.0-20241112063127-f62e98a9936a/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
github.com/apecloud/go-mysql-server v0.0.0-20241112031328-30cddba3eea7 h1:nlBHJDxPrUaDpKkS1xj78C0o/hdU5O3RMwOlBJC+U2k=
github.com/apecloud/go-mysql-server v0.0.0-20241112031328-30cddba3eea7/go.mod h1:SXieGXBXf24LLsXZ8uKu8LaFPfBYgcASfU7wNmWYlUg=
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
Expand Down Expand Up @@ -135,10 +139,14 @@ github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2 h1:u3PMzfF8RkKd3lB9pZ2bfn0qEG+1G
github.com/dolthub/flatbuffers/v23 v23.3.3-dh.2/go.mod h1:mIEZOHnFx4ZMQeawhw9rhsj+0zwQj7adVsnBX7t+eKY=
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662 h1:aC17hZD6iwzBwwfO5M+3oBT5E5gGRiQPdn+vzpDXqIA=
github.com/dolthub/go-icu-regex v0.0.0-20240916130659-0118adc6b662/go.mod h1:KPUcpx070QOfJK1gNe0zx4pA5sicIK1GMikIGLKC168=
github.com/dolthub/go-mysql-server v0.18.2-0.20241112002228-81b13e8034f2 h1:1ax2e+4r9ax5eiowBEIfRX7K/oZLeWxNNtt88CgnO0I=
github.com/dolthub/go-mysql-server v0.18.2-0.20241112002228-81b13e8034f2/go.mod h1:sOMQzWUvHvJECzpcUxjDgV5BR/A7U+hOh596PUO2NPI=
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71 h1:bMGS25NWAGTEtT5tOBsCuCrlYnLRKpbJVJkDbrTRhwQ=
github.com/dolthub/jsonpath v0.0.2-0.20240227200619-19675ab05c71/go.mod h1:2/2zjLQ/JOOSbbSboojeg+cAwcRV0fDLzIiWch/lhqI=
github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216 h1:JWkKRE4EHUcEVQCMRBej8DYxjYjRz/9MdF/NNQh0o70=
github.com/dolthub/sqllogictest/go v0.0.0-20240618184124-ca47f9354216/go.mod h1:e/FIZVvT2IR53HBCAo41NjqgtEnjMJGKca3Y/dAmZaA=
github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9 h1:s36zDuLPuZRWC0nBCJs2Z8joP19eKEtcsIsuE8K9Kx0=
github.com/dolthub/vitess v0.0.0-20241111235433-a20a5ab9d7c9/go.mod h1:uBvlRluuL+SbEWTCZ68o0xvsdYZER3CEG/35INdzfJM=
github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk=
github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
Expand Down

0 comments on commit eb5c918

Please sign in to comment.