add small changes

Author: NeerajDwivedii

google/cloud/odbc/bq_driver/internal/odbc_sql_tables.cc

@@ -444,7 +444,7 @@ StatusRecordOr<ResultSet> GetResultSetForTables(
 
   // 3. Execute tasks using the generic utility
   std::shared_ptr<TraceOptions> trace_option = TraceOptions::GetTraceOption();
-  int max_threads = (trace_option != nullptr) ? trace_option->max_threads : 0;
+  int max_threads = trace_option->max_threads;
   auto parallel_results_or = ExecuteParallelTasks<TaskInput, TaskResult>(
       max_threads, tasks, parallel_func);
 

google/cloud/odbc/bq_driver/internal/trace_utils.cc

@@ -69,31 +69,14 @@ FileLogSink::~FileLogSink() {
     fp_ = nullptr;
   }
 }
-// Required for custom log formatting and writing to the driver's default log
-// file
+// Required for writing to the driver's default log file
 void FileLogSink::Send(absl::LogEntry const& entry) {
   std::lock_guard<std::mutex> lock(log_mutex_);
   // Logging disabled or never initialized
   if (!fp_ || !opts_) return;
 
   auto& opts = *opts_;
-
-  static absl::TimeZone const kTimeZone = absl::LocalTimeZone();
-  std::string time_str =
-      absl::FormatTime("%Y-%m-%d %H:%M:%S", entry.timestamp(), kTimeZone);
-
-  char const* log_tag = absl::LogSeverityName(entry.log_severity());
-
-  absl::string_view full_path = entry.source_filename();
-  size_t pos = full_path.rfind('/');
-  if (pos == absl::string_view::npos) pos = full_path.rfind('\\');
-
-  absl::string_view file_name =
-      pos == absl::string_view::npos ? full_path : full_path.substr(pos + 1);
-
-  std::string formatted_msg =
-      absl::StrFormat("[%s] [%s] [%s:%d] %s\n", log_tag, time_str, file_name,
-                      entry.source_line(), entry.text_message());
+  auto formatted_msg = GetFormattedMsg(entry);
 
   std::size_t new_log_size = formatted_msg.size();
   std::uintmax_t max_file_size_bytes =
@@ -131,6 +114,27 @@ absl::LogSeverity GetAbslSeverity(LogLevel level) {
   }
 }
 
+// Formats log msg in format: [LOG_LEVEL] [TIME] [FILE:LINE] MSG
+std::string GetFormattedMsg(absl::LogEntry const& entry) {
+  static absl::TimeZone const kTimeZone = absl::LocalTimeZone();
+  std::string time_str =
+      absl::FormatTime("%Y-%m-%d %H:%M:%S", entry.timestamp(), kTimeZone);
+
+  char const* log_tag = absl::LogSeverityName(entry.log_severity());
+  absl::string_view full_path = entry.source_filename();
+
+  size_t pos = full_path.rfind('/');
+  if (pos == absl::string_view::npos) pos = full_path.rfind('\\');
+
+  absl::string_view file_name =
+      pos == absl::string_view::npos ? full_path : full_path.substr(pos + 1);
+
+  std::string msg =
+      absl::StrFormat("[%s] [%s] [%s:%d] %s\n", log_tag, time_str, file_name,
+                      entry.source_line(), entry.text_message());
+  return msg;
+}
+
 void ClearOldLogFiles(std::string const& base_dir, int next_index,
                       int max_file_count) {
   if (max_file_count < 1) return;

google/cloud/odbc/bq_driver/internal/trace_utils.h

@@ -165,6 +165,8 @@ void UpdateTraceOption(std::optional<int> log_level,
                        std::optional<int> log_file_count);
 
 std::string GetLogFileWithIndex(std::string const& log_path);
+std::string GetFormattedMsg(absl::LogEntry const& entry);
+
 ////////////////////////////////////////////////////////////////////
 // Additional Helper methods for validating and formatting strings
 // based on parameter types.

google/cloud/odbc/bq_driver/internal/trace_utils_test.cc

@@ -81,6 +81,22 @@ TEST(GetLogFileWithIndex, CustomLogPath) {
   EXPECT_EQ(actual, expected);
 }
 
+TEST(GetFormattedMsg, FormatMsg_success) {
+  absl::Time ts = absl::FromUnixSeconds(1700000000);
+  absl::LogEntry entry(absl::LogSeverity::kInfo,     // severity
+                       "C:\\project\\test_file.cc",  // source file
+                       42,                           // line
+                       ts,                           // timestamp
+                       "Test message"                // message
+  );
+
+  std::string result = GetFormattedMsg(entry);
+
+  EXPECT_TRUE(absl::StrContains(result, "[INFO]"));
+  EXPECT_TRUE(absl::StrContains(result, "test_file.cc:42"));
+  EXPECT_TRUE(absl::StrContains(result, "Test message"));
+}
+
 TEST(ClearOldLogFiles, WhenMaxFileCountIsOne) {
   std::string dir = std::filesystem::temp_directory_path().string();
   std::string file = dir + "/Tracetestingcountone_0.log";