Quick fixes: accuracy mode & C API

Author: pgmpablo157321

loadgen/bindings/c_api.cc

@@ -13,6 +13,7 @@ limitations under the License.
 #include "c_api.h"
 
 #include <string>
+#include <cassert>
 
 #include "../loadgen.h"
 #include "../query_sample.h"
@@ -148,7 +149,7 @@ class GroupedQuerySampleLibraryTrampoline : public QuerySampleLibrary {
 
       total_sample_count_ = 0;
 
-      for(ssize_t i = 0; i < group_sizes.size(); i++){
+      for(size_t i = 0; i < group_sizes.size(); i++){
         group_sizes_.push_back(group_sizes[i]);
         total_sample_count_ += group_sizes[i];
         for(size_t j = 0; j < group_sizes[i]; j++){
@@ -193,7 +194,7 @@ void* ConstructGroupedQSL(ClientData client_data, const char* name, size_t name_
                    UnloadSamplesFromRamCallback unload_samples_from_ram_cb,
                    std::vector<size_t>& group_sizes) {
   GroupedQuerySampleLibraryTrampoline* qsl = new GroupedQuerySampleLibraryTrampoline(
-      client_data, std::string(name, name_length), total_sample_count,
+      client_data, std::string(name, name_length),
       performance_sample_count, load_samples_to_ram_cb,
       unload_samples_from_ram_cb, group_sizes);
   return reinterpret_cast<void*>(qsl);

loadgen/loadgen.cc

@@ -318,7 +318,6 @@ std::vector<QueryMetadata> GenerateQueries(
   auto sample_distribution_equal_issue = SampleDistributionEqualIssue(
       min_queries, loaded_samples.size(), &sample_rng);
 
-  TestScenario temp_scenario = scenario;
   auto schedule_distribution = ScheduleDistribution<scenario>(settings.target_qps);
   auto schedule_constant_distribution = ScheduleConstantDistribution(settings.target_qps);
 
@@ -751,12 +750,11 @@ std::vector<LoadableSampleSet> GenerateLoadableSets(
     size_t number_of_groups = qsl->NumberOfGroups();
     for (size_t i = 0; i < number_of_groups; i++) {
       size_t group_size = qsl->GroupSize(groupIdx[idx]);
-      if (loadable_set.size() + group_size < set_size) {
-        for (size_t j = 0; j < group_size; j++) {
-          loadable_set.push_back(samples[idx]);
-          idx++;
-        }
-      } else {
+      for (size_t j = 0; j < group_size; j++) {
+        loadable_set.push_back(samples[idx]);
+        idx++;
+      }
+      if (loadable_set.size() >= set_size)  {
         result.push_back({std::move(loadable_set), loadable_set.size()});
         loadable_set.clear();
         loadable_set.reserve(set_size + set_padding);