Skip to content
Snippets Groups Projects
Commit 498ab727 authored by Georgy Moshkin's avatar Georgy Moshkin :speech_balloon:
Browse files

test: use create_space api in tests

parent e3f665e4
No related branches found
No related tags found
1 merge request!538Feat/dml global
Pipeline #18651 passed
...@@ -95,21 +95,16 @@ def test_ddl_create_space_bulky(cluster: Cluster): ...@@ -95,21 +95,16 @@ def test_ddl_create_space_bulky(cluster: Cluster):
############################################################################ ############################################################################
# Propose a space creation which will succeed # Propose a space creation which will succeed
commit_index = i1.propose_create_space( cluster.create_space(
dict( dict(
id=space_id, id=space_id,
name="stuff", name="stuff",
format=[dict(name="id", type="unsigned", is_nullable=False)], format=[dict(name="id", type="unsigned", is_nullable=False)],
primary_key=[dict(field="id")], primary_key=["id"],
distribution=dict(kind="global"), distribution="global",
), ),
) )
i1.call(".proc_sync_raft", commit_index, (3, 0))
i2.call(".proc_sync_raft", commit_index, (3, 0))
i3.call(".proc_sync_raft", commit_index, (3, 0))
i4.call(".proc_sync_raft", commit_index, (3, 0))
# This time schema version did change # This time schema version did change
assert i1.call("box.space._pico_property:get", "current_schema_version")[1] == 2 assert i1.call("box.space._pico_property:get", "current_schema_version")[1] == 2
assert i2.call("box.space._pico_property:get", "current_schema_version")[1] == 2 assert i2.call("box.space._pico_property:get", "current_schema_version")[1] == 2
...@@ -210,7 +205,7 @@ def test_ddl_create_sharded_space(cluster: Cluster): ...@@ -210,7 +205,7 @@ def test_ddl_create_sharded_space(cluster: Cluster):
# Propose a space creation which will succeed # Propose a space creation which will succeed
schema_version = i1.next_schema_version() schema_version = i1.next_schema_version()
space_id = 679 space_id = 679
index = i1.propose_create_space( cluster.create_space(
dict( dict(
id=space_id, id=space_id,
name="stuff", name="stuff",
...@@ -219,14 +214,11 @@ def test_ddl_create_sharded_space(cluster: Cluster): ...@@ -219,14 +214,11 @@ def test_ddl_create_sharded_space(cluster: Cluster):
dict(name="foo", type="integer", is_nullable=False), dict(name="foo", type="integer", is_nullable=False),
dict(name="bar", type="string", is_nullable=False), dict(name="bar", type="string", is_nullable=False),
], ],
primary_key=[dict(field="id")], primary_key=["id"],
distribution=dict(kind="sharded_implicitly", sharding_key=["foo", "bar"]), distribution=dict(sharding_key=["foo", "bar"], sharding_fn="murmur3"),
), ),
) )
i1.call(".proc_sync_raft", index, (3, 0))
i2.call(".proc_sync_raft", index, (3, 0))
############################################################################ ############################################################################
# Space was created and is operable # Space was created and is operable
pico_space_def = [ pico_space_def = [
...@@ -381,10 +373,10 @@ def test_successful_wakeup_after_ddl(cluster: Cluster): ...@@ -381,10 +373,10 @@ def test_successful_wakeup_after_ddl(cluster: Cluster):
id=space_id, id=space_id,
name="space_name_conflict", name="space_name_conflict",
format=[dict(name="id", type="unsigned", is_nullable=False)], format=[dict(name="id", type="unsigned", is_nullable=False)],
primary_key=[dict(field="id")], primary_key=["id"],
distribution=dict(kind="global"), distribution="global",
) )
index = i1.propose_create_space(space_def) index = i1.create_space(space_def)
i2.call(".proc_sync_raft", index, (3, 0)) i2.call(".proc_sync_raft", index, (3, 0))
i3.call(".proc_sync_raft", index, (3, 0)) i3.call(".proc_sync_raft", index, (3, 0))
...@@ -416,18 +408,16 @@ def test_ddl_from_snapshot(cluster: Cluster): ...@@ -416,18 +408,16 @@ def test_ddl_from_snapshot(cluster: Cluster):
# TODO: check other ddl operations # TODO: check other ddl operations
# Propose a space creation which will succeed # Propose a space creation which will succeed
space_id = 632 space_id = 632
index = i1.propose_create_space( cluster.create_space(
dict( dict(
id=space_id, id=space_id,
name="stuff", name="stuff",
format=[dict(name="id", type="unsigned", is_nullable=False)], format=[dict(name="id", type="unsigned", is_nullable=False)],
primary_key=[dict(field="id")], primary_key=["id"],
distribution=dict(kind="sharded_implicitly", sharding_key=["id"]), distribution=dict(sharding_key=["id"], sharding_fn="murmur3"),
), ),
) )
i2.call(".proc_sync_raft", index, (3, 0))
tt_space_def = [ tt_space_def = [
space_id, space_id,
1, 1,
......
...@@ -13,7 +13,7 @@ def test_global_space_dml_catchup_by_log(cluster: Cluster): ...@@ -13,7 +13,7 @@ def test_global_space_dml_catchup_by_log(cluster: Cluster):
# Catcher-upper replicaset follower # Catcher-upper replicaset follower
i5 = cluster.add_instance(wait_online=True, replicaset_id="r2") i5 = cluster.add_instance(wait_online=True, replicaset_id="r2")
index = i1.ddl_create_space( cluster.create_space(
dict( dict(
id=812, id=812,
name="candy", name="candy",
...@@ -22,11 +22,10 @@ def test_global_space_dml_catchup_by_log(cluster: Cluster): ...@@ -22,11 +22,10 @@ def test_global_space_dml_catchup_by_log(cluster: Cluster):
dict(name="kind", type="string", is_nullable=False), dict(name="kind", type="string", is_nullable=False),
dict(name="kilos", type="number", is_nullable=False), dict(name="kilos", type="number", is_nullable=False),
], ],
primary_key=[dict(field="id")], primary_key=["id"],
distribution=dict(kind="global"), distribution="global",
), ),
) )
i2.raft_wait_index(index, 3)
# Some dml # Some dml
index = i1.cas("insert", "candy", [1, "marshmallow", 2.7]) index = i1.cas("insert", "candy", [1, "marshmallow", 2.7])
...@@ -103,7 +102,7 @@ def test_global_space_dml_catchup_by_snapshot(cluster: Cluster): ...@@ -103,7 +102,7 @@ def test_global_space_dml_catchup_by_snapshot(cluster: Cluster):
# Catcher-upper replicaset follower # Catcher-upper replicaset follower
i5 = cluster.add_instance(wait_online=True, replicaset_id="r2") i5 = cluster.add_instance(wait_online=True, replicaset_id="r2")
index = i1.ddl_create_space( cluster.create_space(
dict( dict(
id=812, id=812,
name="candy", name="candy",
...@@ -112,11 +111,10 @@ def test_global_space_dml_catchup_by_snapshot(cluster: Cluster): ...@@ -112,11 +111,10 @@ def test_global_space_dml_catchup_by_snapshot(cluster: Cluster):
dict(name="kind", type="string", is_nullable=False), dict(name="kind", type="string", is_nullable=False),
dict(name="kilos", type="number", is_nullable=False), dict(name="kilos", type="number", is_nullable=False),
], ],
primary_key=[dict(field="id")], primary_key=["id"],
distribution=dict(kind="global"), distribution="global",
), )
) )
i2.raft_wait_index(index, 3)
# Some dml # Some dml
index = i1.cas("insert", "candy", [1, "marshmallow", 2.7]) index = i1.cas("insert", "candy", [1, "marshmallow", 2.7])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment