refactoring for resultset C wrapper

CMakeLists.txt

@@ -230,8 +230,6 @@ set(SOURCE_FILES_CPP_WRAPPER
         cpp/lib/ClientQueryContextCache.cpp
         cpp/lib/ClientQueryContextCache.hpp
         cpp/lib/result_set.cpp
-        cpp/lib/result_set_arrow.cpp
-        cpp/lib/result_set_json.cpp
         cpp/lib/ResultSet.cpp
         cpp/lib/ResultSet.hpp
         cpp/lib/ResultSetArrow.cpp
@@ -246,8 +244,6 @@ set(SOURCE_FILES_CPP_WRAPPER
         cpp/util/CurlDesc.cpp
         cpp/util/CurlDescPool.cpp
         lib/result_set.h
-        lib/result_set_arrow.h
-        lib/result_set_json.h
         lib/query_context_cache.h
         lib/curl_desc_pool.h
         lib/authenticator.h)

cpp/lib/ResultSet.hpp

@@ -12,21 +12,13 @@
 #include "cJSON.h"
 #include "snowflake/basic_types.h"
 #include "snowflake/client.h"
+#include "result_set.h"
 
 namespace Snowflake
 {
 namespace Client
 {
 
-/**
- * Enumeration over valid query result formats.
- */
-enum QueryResultFormat
-{
-    ARROW,
-    JSON
-};
-
 /**
  * The implementation of a base result set.
  *
@@ -194,6 +186,13 @@ class ResultSet
      */
     virtual SF_STATUS STDCALL isCellNull(size_t idx, sf_bool * out_data) = 0;
 
+    /**
+     * Gets the total number of rows in the current chunk being processed.
+     *
+     * @return the number of rows in the current chunk.
+     */
+    virtual size_t getRowCountInChunk() = 0;
+
     // Other member getters ========================================================================
 
     SF_STATUS getError()
@@ -215,6 +214,11 @@ class ResultSet
         }
     }
 
+    QueryResultFormat_t getResultFormat()
+    {
+        return m_queryResultFormat;
+    }
+
 protected:
 
     // Protected members ===========================================================================
@@ -303,7 +307,7 @@ class ResultSet
     /**
      * The format of the result set.
      */
-    QueryResultFormat m_queryResultFormat;
+    QueryResultFormat_t m_queryResultFormat;
 
     /**
      * The tz string to use when dealing with time or timestamp values.

cpp/lib/ResultSetArrow.cpp

@@ -10,7 +10,6 @@
 
 #include "../logger/SFLogger.hpp"
 #include "ResultSetArrow.hpp"
-#include "result_set_arrow.h"
 #include "DataConversion.hpp"
 #include "results.h"
 
@@ -24,7 +23,7 @@ namespace Client
 ResultSetArrow::ResultSetArrow() :
     Snowflake::Client::ResultSet()
 {
-    m_queryResultFormat = QueryResultFormat::ARROW;
+    m_queryResultFormat = SF_ARROW_FORMAT;
 }
 
 ResultSetArrow::ResultSetArrow(
@@ -34,7 +33,7 @@ ResultSetArrow::ResultSetArrow(
 ) :
     ResultSet(metadata, tzString)
 {
-    m_queryResultFormat = QueryResultFormat::ARROW;
+    m_queryResultFormat = SF_ARROW_FORMAT;
 
     this->appendChunk(initialChunk);
 
@@ -44,6 +43,36 @@ ResultSetArrow::ResultSetArrow(
     m_currRowIdx = 0;
 }
 
+ResultSetArrow::ResultSetArrow(
+    cJSON * jsonRowset64,
+    SF_COLUMN_DESC * metadata,
+    std::string tzString
+) :
+    ResultSet(metadata, tzString)
+{
+    m_queryResultFormat = SF_ARROW_FORMAT;
+
+    arrow::BufferBuilder* bufferBuilder = NULL;
+    if (jsonRowset64)
+    {
+        const char* base64RowsetStr = snowflake_cJSON_GetStringValue(jsonRowset64);
+        if (base64RowsetStr && strlen(base64RowsetStr) > 0)
+        {
+            // Decode Base64-encoded Arrow-format rowset of the chunk and build a buffer builder from it.
+            std::string decodedRowsetStr = arrow::util::base64_decode(std::string(base64RowsetStr));
+            bufferBuilder = new arrow::BufferBuilder();
+            (void)bufferBuilder->Append((void*)decodedRowsetStr.c_str(), decodedRowsetStr.length());
+        }
+    }
+
+    this->appendChunk(bufferBuilder);
+
+    // Reset row indices so that they can be re-used by public API.
+    m_currChunkIdx = 0;
+    m_currChunkRowIdx = 0;
+    m_currRowIdx = 0;
+}
+
 ResultSetArrow::~ResultSetArrow()
 {
     ; // Do nothing.

cpp/lib/ResultSetArrow.hpp

@@ -64,6 +64,20 @@ class ResultSetArrow : public Snowflake::Client::ResultSet
      */
     ResultSetArrow(arrow::BufferBuilder * initialChunk, SF_COLUMN_DESC * metadata, std::string tzString);
 
+
+    /**
+     * Parameterized constructor.
+     *
+     * This constructor will initialize m_records with the (partial) results
+     * contained in the initial chunk. It will also initialize m_metadata with
+     * the metadata in "metadata".
+     *
+     * @param jsonRowset64         A pointer to the rowset64 data in json result set.
+     * @param metadata             An array of metadata objects for each column.
+     * @param tzString             The time zone.
+     */
+    ResultSetArrow(cJSON* jsonRowset64, SF_COLUMN_DESC* metadata, std::string tzString);
+
     /**
      * Destructor.
      */

cpp/lib/ResultSetJson.cpp

@@ -20,7 +20,7 @@ namespace Client
 ResultSetJson::ResultSetJson() :
     ResultSet()
 {
-    m_queryResultFormat = QueryResultFormat::JSON;
+    m_queryResultFormat = SF_JSON_FORMAT;
 }
 
 ResultSetJson::ResultSetJson(
@@ -30,7 +30,7 @@ ResultSetJson::ResultSetJson(
 ) :
     ResultSet(metadata, tzString)
 {
-    m_queryResultFormat = QueryResultFormat::JSON;
+    m_queryResultFormat = SF_JSON_FORMAT;
     m_chunk = nullptr;
     appendChunk(rowset);
 }