@@ -789,10 +789,10 @@ hana() {
789
789
}
790
790
791
791
cockroachdb () {
792
- cockroachdb_23_1
792
+ cockroachdb_24_1
793
793
}
794
794
795
- cockroachdb_23_1 () {
795
+ cockroachdb_24_1 () {
796
796
$CONTAINER_CLI rm -f cockroach || true
797
797
LOG_CONFIG="
798
798
sinks:
@@ -802,7 +802,7 @@ sinks:
802
802
redact: false
803
803
exit-on-error: true
804
804
"
805
- $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_23_1 :- docker.io / cockroachdb/ cockroach: v23 .1.12 } start-single-node \
805
+ $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_24_1 :- cockroachdb/ cockroach: v24 .1.5 } start-single-node \
806
806
--insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log=" $LOG_CONFIG "
807
807
OUTPUT=
808
808
while [[ $OUTPUT != * " CockroachDB node starting" * ]]; do
@@ -812,28 +812,26 @@ sinks:
812
812
OUTPUT=$( $CONTAINER_CLI logs cockroach 2>&1 )
813
813
done
814
814
echo " Enabling experimental box2d operators and some optimized settings for running the tests"
815
- # settings documented in https://www.cockroachlabs.com/docs/v22 .1/local-testing.html #use-a-local-single-node-cluster-with-in-memory-storage
815
+ # settings documented in https://www.cockroachlabs.com/docs/v24 .1/local-testing#use-a-local-single-node-cluster-with-in-memory-storage
816
816
$CONTAINER_CLI exec cockroach bash -c " cat <<EOF | ./cockroach sql --insecure
817
817
SET CLUSTER SETTING sql.spatial.experimental_box2d_comparison_operators.enabled = on;
818
- SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = true;
819
818
SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms';
820
819
SET CLUSTER SETTING jobs.registry.interval.gc = '30s';
821
820
SET CLUSTER SETTING jobs.registry.interval.cancel = '180s';
822
821
SET CLUSTER SETTING jobs.retention_time = '15s';
823
822
SET CLUSTER SETTING sql.stats.automatic_collection.enabled = false;
824
823
SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
825
- SET CLUSTER SETTING sql.defaults.serial_normalization = 'sql_sequence_cached';
826
824
ALTER RANGE default CONFIGURE ZONE USING " gc.ttlseconds" = 600;
827
825
ALTER DATABASE system CONFIGURE ZONE USING " gc.ttlseconds" = 600;
828
826
829
827
quit
830
828
EOF
831
829
"
832
830
echo " Cockroachdb successfully started"
833
-
834
831
}
835
832
836
- cockroachdb_22_2 () {
833
+
834
+ cockroachdb_23_1 () {
837
835
$CONTAINER_CLI rm -f cockroach || true
838
836
LOG_CONFIG="
839
837
sinks:
@@ -843,7 +841,7 @@ sinks:
843
841
redact: false
844
842
exit-on-error: true
845
843
"
846
- $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_22_2 :- docker.io/ cockroachdb/ cockroach: v22.2.2 } start-single-node \
844
+ $CONTAINER_CLI run -d --name=cockroach -m 6g -p 26257:26257 -p 8080:8080 ${DB_IMAGE_COCKROACHDB_23_1 :- docker.io/ cockroachdb/ cockroach: v23.1.28 } start-single-node \
847
845
--insecure --store=type=mem,size=0.25 --advertise-addr=localhost --log=" $LOG_CONFIG "
848
846
OUTPUT=
849
847
while [[ $OUTPUT != * " CockroachDB node starting" * ]]; do
@@ -866,7 +864,6 @@ SET CLUSTER SETTING kv.range_split.by_load_merge_delay = '5s';
866
864
SET CLUSTER SETTING sql.defaults.serial_normalization = 'sql_sequence_cached';
867
865
ALTER RANGE default CONFIGURE ZONE USING " gc.ttlseconds" = 600;
868
866
ALTER DATABASE system CONFIGURE ZONE USING " gc.ttlseconds" = 600;
869
- SET CLUSTER SETTING sql.defaults.serial_normalization=sql_sequence;
870
867
871
868
quit
872
869
EOF
@@ -968,8 +965,8 @@ if [ -z ${1} ]; then
968
965
echo " No db name provided"
969
966
echo " Provide one of:"
970
967
echo -e " \tcockroachdb"
968
+ echo -e " \tcockroachdb_24_1"
971
969
echo -e " \tcockroachdb_23_1"
972
- echo -e " \tcockroachdb_22_2"
973
970
echo -e " \tdb2"
974
971
echo -e " \tdb2_11_5"
975
972
echo -e " \tdb2_10_5"
0 commit comments