Merge remote-tracking branch 'upstream/eloq-10.6.10' into eloq-10.6.10

Author: githubzilla

.editorconfig

@@ -0,0 +1,66 @@
+# EditorConfig for C++ projects
+
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+# Common C++ source files
+[*.{cpp,cc,cxx}]
+indent_style = space
+indent_size = 2
+
+# Header files
+[*.{hpp,h,hh,hxx,ixx}]
+indent_style = space
+indent_size = 2
+
+# CMake files
+[CMakeLists.txt]
+indent_style = space
+indent_size = 2
+
+[*.cmake]
+indent_style = space
+indent_size = 2
+
+# Makefiles require tabs
+[Makefile]
+indent_style = tab
+
+# Python scripts (often found in build systems)
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Shell scripts
+[*.sh]
+indent_style = space
+indent_size = 2
+
+# Markdown documentation
+[*.md]
+trim_trailing_whitespace = false  # Allow trailing spaces for line breaks
+max_line_length = 80
+
+# JSON config files
+[*.json]
+indent_style = space
+indent_size = 2
+
+# YAML config files
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2
+
+# Git ignore
+[.gitignore]
+indent_style = space
+indent_size = 2
+
+# Text files
+[*.txt]
+trim_trailing_whitespace = false

.gitignore

@@ -538,7 +538,6 @@ compile_commands.json
 .clang-format
 .kscope/
 .vimrc
-.editorconfig
 .kateconfig
 *.kdev4
 

data_substrate

@@ -4152,6 +4152,7 @@ int ha_eloq::PkIndexScanOpen(const txservice::TxKey *start_key,
   bool require_recs= decode_flag_ > 0;
   bool require_sort= eloq_random_scan_sort ||
                      (active_index != MAX_INDEXES && decode_flag_ > 0);
+  end_specified_= end_key != nullptr;
 
   auto [yield_func, resume_func]= my_tx->CoroFunctors();
 
@@ -4211,6 +4212,7 @@ int ha_eloq::SkIndexScanOpen(const txservice::TxKey *start_index_key,
   bool is_require_keys= has_hidden_pk(table) || decode_flag_ > 0;
   bool is_require_recs= is_require_keys;
   bool is_require_sort= is_require_keys;
+  end_specified_= end_index_key != nullptr;
 
   auto [yield_func, resume_func]= my_tx->CoroFunctors();
 
@@ -5212,7 +5214,7 @@ int ha_eloq::IndexScanClose()
   ccm_scan_key_= nullptr;
   ccm_scan_rec_= nullptr;
   ccm_scan_rec_status_= txservice::RecordStatus::Unknown;
-
+  end_specified_= false;
   scan_batch_idx_= UINT64_MAX;
   if (scan_batch_.size() > DEFAULT_SCAN_TUPLE_SIZE)
   {

storage/eloq/ha_eloq.cc

@@ -717,6 +717,12 @@ class ha_eloq : public handler
 
   uint32_t PrefetchSize()
   {
+    if (end_specified_)
+    {
+      // Prefetch more agressively if end key is specified as the scan
+      // will not prefetch beyond the end key.
+      return 256;
+    }
     std::array<uint32_t, 5> boundaries= {1, 4, 16, 64, 256};
 
     size_t idx= 0;
@@ -774,6 +780,7 @@ class ha_eloq : public handler
   txservice::TxKey search_tx_key_{&search_key_};
   EloqKey scan_end_key_;
   txservice::TxKey scan_end_tx_key_{&scan_end_key_};
+  bool end_specified_{false};
 
   uint64_t scan_alias_{UINT64_MAX};
   // index currently used if scan is active