rebase

Signed-off-by: gal salomon <gal.salomon@gmail.com>

Author: galsalomon66

example/CMakeLists.txt

@@ -1,7 +1,7 @@
 add_executable(s3select_example s3select_example.cpp)
 target_include_directories(s3select_example PUBLIC ../include ../rapidjson/include)
 add_executable(s3select_scaleup s3select_scaleup.cpp)
-target_include_directories(s3select_scaleup PUBLIC ../include)
+target_include_directories(s3select_scaleup PUBLIC ../include ../rapidjson/include)
 
 find_package(Arrow QUIET)
 

example/s3select_example.cpp

@@ -373,7 +373,7 @@ int process_json_query(const char* input_query,const char* fname)
   auto object_sz = boost::filesystem::file_size(fname);
   json_object json_query_processor(&s3select_syntax);
   std::string buff(BUFFER_SIZE,0);
-  std::string result;
+  s3selectEngine::s3select_result result;
 
   size_t read_sz = input_file_stream.readsome(buff.data(),BUFFER_SIZE);
 

include/s3select.h

@@ -2700,7 +2700,7 @@ class json_object : public base_s3object
   JsonParserHandler JsonHandler;
   size_t m_processed_bytes;
   bool m_end_of_stream;
-  std::string s3select_result;
+  s3selectEngine::s3select_result s3select_result;
   size_t m_row_count;
   bool star_operation_ind;
   std::string m_error_description;
@@ -2804,21 +2804,20 @@ class json_object : public base_s3object
     return 0;
   }
 
-  void sql_error_handling(s3selectEngine::base_s3select_exception& e,std::string& result)
+  void sql_error_handling(s3selectEngine::base_s3select_exception& e,s3selectEngine::s3select_result& s3select_result)
   {
     //the JsonHandler makes the call to SQL processing, upon a failure to procees the SQL statement, 
     //the error-handling takes care of the error flow.
     m_error_description = e.what();
     m_error_count++;
     s3select_result.append(std::to_string(m_error_count));
-    s3select_result += " : ";
-    s3select_result.append(m_error_description);
-    s3select_result += m_csv_defintion.output_row_delimiter;
+    s3select_result.append(" : ");
+    s3select_result.append(std::string(1, m_csv_defintion.output_row_delimiter)); 
   }
 
 public:
 
-  int run_s3select_on_stream(std::string& result, const char* json_stream, size_t stream_length, size_t obj_size)
+  int run_s3select_on_stream(s3selectEngine::s3select_result& result, const char* json_stream, size_t stream_length, size_t obj_size)
   {
     int status=0;
     m_processed_bytes += stream_length;

include/s3select_oper.h

@@ -1333,11 +1333,6 @@ class base_statement
   m_projection_alias(nullptr), m_eval_stack_depth(0), m_skip_non_aggregate_op(false),m_json_statement(false) {}
   multiple_executions_en execution_phase;
 
-public:
-  base_statement():m_scratch(nullptr), is_last_call(false), m_is_cache_result(false),
-  m_projection_alias(nullptr), m_eval_stack_depth(0), m_skip_non_aggregate_op(false),
-  execution_phase(multiple_executions_en::NA){}
-
   virtual value& eval()
   {
     //purpose: on aggregation flow to run only the correct subtree(aggregation subtree)

test/s3select_test.cpp

@@ -2680,15 +2680,15 @@ TEST(TestS3selectFunctions, json_queries)
 )";
 
   //count JSON structure, from-clause is empty.
-  std::string result;
+  s3selectEngine::s3select_result result;
   const char* input_query = "select count(0) from s3object[*];";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,"1");
+  ASSERT_EQ(result.str(),"1");
 
   //count JSON structure, from-clause points an array of objects.
   input_query = "select count(0) from s3object[*].phoneNumbers;";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,"10");
+  ASSERT_EQ(result.str(),"10");
 
   //select specific key in array, from-clause points an array of objects.
   std::string expected_result=R"(11
@@ -2704,14 +2704,14 @@ TEST(TestS3selectFunctions, json_queries)
 )";
   input_query = "select _1.addr from s3object[*].phoneNumbers;";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,expected_result);
+  ASSERT_EQ(result.str(),expected_result);
 
   //select specific keys in array, operation on fetched value, from-clause is empty.
   expected_result=R"(Joe_2,XXX,25
 )";
   input_query = "select _1.firstname,_1.key_after_array,_1.age+4 from s3object[*];";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,expected_result);
+  ASSERT_EQ(result.str(),expected_result);
 
   expected_result=R"(null,null,null
 null,null,null
@@ -2727,15 +2727,15 @@ null,null,null
   //select non-exists keys, from-clause points on array.
   input_query = "select _1.firstname,_1.key_after_array,_1.age+4 from s3object[*].phonenumbers;";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,expected_result);
+  ASSERT_EQ(result.str(),expected_result);
 
   expected_result=R"(7349280
 )";
 
   //select key, operation on value, with predicate(where-clause), from-clause points on array.
   input_query = "select cast(substring(_1.number,1,6) as int) *10 from s3object[*].phonenumbers where _1.type='home2';";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,expected_result);
+  ASSERT_EQ(result.str(),expected_result);
 
   expected_result=R"(firstName. : Joe
 lastName. : Jackson
@@ -2788,7 +2788,7 @@ key_after_array. : XXX
   // star-operation on object, empty from-clause
   input_query = "select * from s3object[*];";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,expected_result);
+  ASSERT_EQ(result.str(),expected_result);
 
   expected_result=R"(phoneNumbers.type. : home2
 phoneNumbers.number. : 734928_2
@@ -2823,7 +2823,7 @@ phoneNumbers.addr. : 88
   // star-operation on object, from-clause points on array, with where-clause
   input_query = "select * from s3object[*].phonenumbers where _1.addr between 20 and 89;";
   run_json_query(input_query, json_input,result);
-  ASSERT_EQ(result,expected_result);
+  ASSERT_EQ(result.str(),expected_result);
 
 }
 

test/s3select_test.h

@@ -575,7 +575,7 @@ std::string run_s3select(std::string expression,std::string input)
 }
 
 // JSON tests API's
-int run_json_query(const char* json_query, std::string& json_input,std::string& result)
+int run_json_query(const char* json_query, std::string& json_input,s3selectEngine::s3select_result& result)
 {//purpose: run single-chunk json queries
 
   s3select s3select_syntax;