Skip to content

Commit 488b611

Browse files
Forward load_docs_using to doc_generator for tiny doc_size callers
The default_loader path in doc_generator subtracts a ~80-byte JSON template skeleton from doc_size and rejects anything <= 0. Tests that intentionally use tiny doc_size (0, 1, 5, 10) trip ValueError unless they pass load_using=self.load_docs_using so sirius_java_sdk's SiriusJavaDocGen accepts the raw payload size directly. Change-Id: Id5ef20e242925d90d2d7e9dcdae387ae362c8528 Reviewed-on: https://review.couchbase.org/c/TAF/+/244720 Tested-by: Build Bot <build@couchbase.com> Reviewed-by: Balakumaran G <balakumaran.gopal@couchbase.com>
1 parent f2a97b9 commit 488b611

3 files changed

Lines changed: 15 additions & 8 deletions

File tree

pytests/bucket_param_tests/dgm.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,8 @@ def check_replica_eviction():
228228
mutation_type="ADD")
229229
read_gen = doc_generator(
230230
self.key, op_index, op_index+op_batch_size,
231-
key_size=self.key_size, doc_size=0)
231+
key_size=self.key_size, doc_size=0,
232+
load_using=self.load_docs_using)
232233

233234
create_task = self.task.async_load_gen_docs(
234235
self.cluster, bucket, create_gen, "create", 0,

pytests/epengine/basic_ops.py

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -727,7 +727,8 @@ def test_MB_40967(self):
727727
max_gets = 2500000000
728728
bucket = self.cluster.buckets[0]
729729
doc_gen = doc_generator(self.key, 0, self.num_items,
730-
doc_size=1)
730+
doc_size=1,
731+
load_using=self.load_docs_using)
731732
create_task = self.task.async_load_gen_docs(
732733
self.cluster, bucket, doc_gen, DocLoading.Bucket.DocOps.CREATE, 0,
733734
batch_size=100, process_concurrency=self.process_concurrency,
@@ -830,11 +831,12 @@ def get_timings(bucket_name):
830831
for node in kv_nodes:
831832
cb_stat_obj[node] = Cbstats(node)
832833

833-
doc_gen = doc_generator(self.key, 0, self.num_items, doc_size=1)
834+
doc_gen = doc_generator(self.key, 0, self.num_items, doc_size=1,
835+
load_using=self.load_docs_using)
834836
create_task = self.task.async_load_gen_docs(
835837
self.cluster, bucket, doc_gen, DocLoading.Bucket.DocOps.CREATE, 0,
836838
batch_size=500, process_concurrency=self.process_concurrency,
837-
timeout_secs=self.sdk_timeout)
839+
timeout_secs=self.sdk_timeout, load_using=self.load_docs_using)
838840
self.task_manager.get_task_result(create_task)
839841

840842
mc_stat_reset_thread = Thread(target=reset_mcstat, args=[bucket.name])
@@ -1384,7 +1386,8 @@ def test_mb_47267(self):
13841386
small_bucket = self.cluster.buckets[1]
13851387

13861388
# Big bucket docs generation
1387-
doc_gen = doc_generator(self.key, 0, self.num_items, doc_size=10)
1389+
doc_gen = doc_generator(self.key, 0, self.num_items, doc_size=10,
1390+
load_using=self.load_docs_using)
13881391
load_task = self.task.async_load_gen_docs(
13891392
self.cluster, big_bucket, doc_gen,
13901393
DocLoading.Bucket.DocOps.CREATE, 0,
@@ -1400,7 +1403,8 @@ def test_mb_47267(self):
14001403
self.task_manager.get_task_result(load_task)
14011404

14021405
# Small bucket docs generation
1403-
doc_gen_small = doc_generator(self.key, 0, 500, doc_size=10)
1406+
doc_gen_small = doc_generator(self.key, 0, 500, doc_size=10,
1407+
load_using=self.load_docs_using)
14041408
load_task_2 = self.task.async_load_gen_docs(
14051409
self.cluster, small_bucket, doc_gen_small,
14061410
DocLoading.Bucket.DocOps.CREATE, 0,
@@ -1484,7 +1488,8 @@ def test_MB_41942(self):
14841488
vbucket_type="active")
14851489
doc_gen = doc_generator(self.key, 0, 10000,
14861490
doc_size=1, vbuckets=bucket.numVBuckets,
1487-
target_vbucket=active_vbs)
1491+
target_vbucket=active_vbs,
1492+
load_using=self.load_docs_using)
14881493

14891494
# Load with doc_ttl set
14901495
self.log.info("Setting doc_ttl=1 for %s docs" % 10000)

pytests/epengine/durability_success.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -589,7 +589,8 @@ def test_buffer_ack_during_dcp_commit(self):
589589
self.fail("Test requires valid durability level for sync_writes")
590590

591591
doc_gen = doc_generator(self.key, self.num_items, self.num_items*3,
592-
key_size=10, doc_size=5)
592+
key_size=10, doc_size=5,
593+
load_using=self.load_docs_using)
593594
self.log.info("Loading %s keys into the bucket" % (self.num_items*2))
594595
load_task = self.task.async_load_gen_docs(
595596
self.cluster, self.bucket, doc_gen,

0 commit comments

Comments
 (0)