Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removed extra geo test from 1.3.1 version #115

Merged
merged 5 commits into from
Apr 12, 2024
Merged

Removed extra geo test from 1.3.1 version #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cd1e47d
Removed extra geo test from 1.3.1 version
qvad Mar 19, 2024
d806805
Fixed
qvad Mar 19, 2024
b070066
Fixed auto.clj to enable colocation and packed after 2.16 release
qvad Apr 11, 2024
d26ade0
Returned colocated by random
qvad Apr 12, 2024
be52073
Fixed syntax
qvad Apr 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion yugabyte/run-jepsen.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@

# YSQL snapshot isolation
"ysql/si.ol.append",
"ysql/si.ol.geo.append",
"ysql/si.bank",
"ysql/si.bank-contention",
"ysql/si.bank-multitable",
Expand Down
9 changes: 6 additions & 3 deletions yugabyte/src/yugabyte/core.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
[yugabyte.set :as set]
[yugabyte.utils :as utils]
[yugabyte.utils :refer :all]
[version-clj.core :as v]
[yugabyte.ycql.bank]
[yugabyte.ycql.bank-improved]
[yugabyte.ycql.counter]
Expand All @@ -40,6 +41,7 @@
(:import (jepsen.client Client)))

(def version-regex #"(?<=yugabyte\-)(\d+\.\d+(\.\d+){0,2}(-b\d+)?)")
(def minimal-packed-version "2.16.4.0-b1")

(defn noop-test
"NOOP test, exists to validate setup/teardown phases"
Expand Down Expand Up @@ -313,9 +315,10 @@
(defn test-3
"Final phase where we define global cluster configuration parameters"
[opts]
(let [packed-columns-enabled (> (rand) 0.5)
colocated (and (not (utils/is-test-geo-partitioned? opts)) (> (rand) 0.5))]
(assoc opts :yb-packed-columns-enabled packed-columns-enabled :yb-colocated colocated)))
(let [packed-columns-enabled (and (v/newer-or-equal? (:version test) minimal-packed-version) (> (rand) 0.5))
colocated (and (not (utils/is-test-geo-partitioned? opts)) (> (rand) 0.5))]
(assoc opts :yb-packed-columns-enabled packed-columns-enabled :yb-colocated colocated))
())

(defn yb-test
"Constructs a yugabyte test from CLI options."
Expand Down
1 change: 0 additions & 1 deletion yugabyte/src/yugabyte/ysql/bank_improved.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
(:require [version-clj.core :as v]
[clojure.java.jdbc :as j]
[clojure.tools.logging :refer [info]]
[clojure.tools.logging :refer [debug info warn]]
[yugabyte.ysql.client :as c]))

(def table-name "accounts")
Expand Down
Loading