Merge branch 'wl12150-compression' into release/8.0.20

Author: rsomla1

cdk/extra/CMakeLists.txt

@@ -49,6 +49,8 @@ ADD_LIBRARY(lz4 STATIC
     lz4/xxhash.c
 )
 
+set_target_properties(lz4 PROPERTIES FOLDER "Misc")
+
 target_include_directories(lz4 PUBLIC lz4)
 
 add_subdirectory(zstd)

cdk/extra/zlib/CMakeLists.txt

@@ -159,6 +159,8 @@ endif()
 ADD_LIBRARY(zlib STATIC
   ${ZLIB_SRCS} ${ZLIB_PUBLIC_HDRS} ${ZLIB_PRIVATE_HDRS})
 
+set_target_properties(zlib PROPERTIES FOLDER "Misc")
+
 if(NOT CYGWIN)
     # This property causes shared libraries on Linux to have the full version
     # encoded into their final filename.  We disable this on Cygwin because
@@ -181,5 +183,5 @@ elseif(UNIX)
    endif()
 endif()
 
-ADD_EXECUTABLE(try_zlib try.cc)
-TARGET_LINK_LIBRARIES(try_zlib zlib)
+#ADD_EXECUTABLE(try_zlib try.cc)
+#TARGET_LINK_LIBRARIES(try_zlib zlib)

cdk/extra/zstd/CMakeLists.txt

@@ -52,6 +52,8 @@ SET(ZSTD_SRCS
 )
 
 ADD_LIBRARY(zstd STATIC ${ZSTD_SRCS})
+set_target_properties(zstd PROPERTIES FOLDER "Misc")
+
 #-----------------------------------------------------------------------------
 # Add extra compilation flags
 #-----------------------------------------------------------------------------

devapi/tests/session-t.cc

@@ -133,6 +133,7 @@ class Sess : public mysqlx::test::Xplugin
 
 };
 
+
 void check_compress(mysqlx::Session &sess)
 {
   {
@@ -148,15 +149,28 @@ void check_compress(mysqlx::Session &sess)
     query.append("'");
 
     SqlResult res = sess.sql(query).execute();
-    Row row;
-    while ((row = res.fetchOne()))
+
+    auto test_row = [](const std::string &data, const std::string &row)
     {
-      cout << "Uncompressed data: " << row[0] << endl;
-    }
+      size_t len = data.length();
+      for (int i = 0; i < 5000; ++i)
+        if(row.substr(i*len,len) != data)
+          FAIL() << "Data differs at position" << 5*len;
+    };
+
+    Row row;
+
+    EXPECT_TRUE(row = res.fetchOne());
+    test_row("Test ", row[0].get<std::string>());
+
+    EXPECT_TRUE(row = res.fetchOne());
+    test_row("0123 ", row[0].get<std::string>());
+
+    cout << "Data is correct" << endl;
   }
 
   {
-    SqlResult res = sess.sql("SHOW STATUS LIKE 'Mysqlx%compress%'").execute();
+    SqlResult res = sess.sql("SHOW STATUS LIKE 'Mysqlx_bytes%compress%'").execute();
     Row row;
     int actual_row_count = 0;
     while((row = res.fetchOne()))
@@ -165,7 +179,7 @@ void check_compress(mysqlx::Session &sess)
       ++actual_row_count;
       EXPECT_TRUE(std::stol((std::string)row[1], nullptr, 0) > 0);
     }
-    cout << "Status rows fetched: " << actual_row_count;
+    cout << "Status rows fetched: " << actual_row_count << endl;
     EXPECT_TRUE(actual_row_count > 0);
   }
 };
@@ -282,7 +296,7 @@ TEST_F(Sess, tls_ver_ciphers)
     mysqlx::Session sess(str.str());
 
     EXPECT_TRUE(0 < versions.count(check_var(sess, "Mysqlx_ssl_version")));
-    EXPECT_NO_THROW(suites_map.at(check_var(sess, "Mysqlx_ssl_cipher")));
+    EXPECT_NO_THROW((void)suites_map.at(check_var(sess, "Mysqlx_ssl_cipher")));
 
 
     // Negative: invalid or not accepted ciphers
@@ -378,7 +392,7 @@ TEST_F(Sess, tls_ver_ciphers)
       mysqlx::Session sess(opt);
 
       EXPECT_TRUE(0 < versions.count(check_var(sess, "Mysqlx_ssl_version")));
-      EXPECT_NO_THROW(suites_map.at(check_var(sess, "Mysqlx_ssl_cipher")));
+      EXPECT_NO_THROW((void)suites_map.at(check_var(sess, "Mysqlx_ssl_cipher")));
     }
 
     // Negative: invalid or not accepted ciphers

xapi/tests/xapi-t.cc

@@ -52,19 +52,36 @@ void check_compress(mysqlx_session_t *sess)
   mysqlx_result_t *res;
   mysqlx_row_t *row;
 
-  CRUD_CHECK(res = mysqlx_sql(sess, query.c_str(), strlen(query.c_str())), sess);
-
-  while ((row = mysqlx_row_fetch_one(res)) != NULL)
+  auto test_row = [](const std::string &data, const std::string &row)
   {
-    char *buf = new char[65536];
-    size_t buf_len = 65536;
-    memset(buf, 0, buf_len);
-    EXPECT_EQ(RESULT_OK, mysqlx_get_bytes(row, 0, 0, buf, &buf_len));
-    printf("Uncompressed data: %s\n", buf);
-    delete[] buf;
-  }
+    size_t len = data.length();
+    for (int i = 0; i < 5000; ++i)
+      if (row.substr(i * len, len) != data)
+        FAIL() << "Data differs at position" << 5 * len;
+  };
+
+  CRUD_CHECK(res = mysqlx_sql(sess, query.c_str(), query.length()), sess);
+
+  char *buf = new char[65536];
+  size_t buf_len;
+  
+  buf_len = 65536;
+  memset(buf, 0, buf_len);
+  EXPECT_NE(nullptr, row = mysqlx_row_fetch_one(res));
+  EXPECT_EQ(RESULT_OK, mysqlx_get_bytes(row, 0, 0, buf, &buf_len));
+  test_row("Test ", buf);
+
+  buf_len = 65536;
+  memset(buf, 0, buf_len);
+  EXPECT_NE(nullptr, row = mysqlx_row_fetch_one(res));
+  EXPECT_EQ(RESULT_OK, mysqlx_get_bytes(row, 0, 0, buf, &buf_len));
+  test_row("0123 ", buf);
+
+  delete[] buf;
 
-  const char *query2 = (const char*)"SHOW STATUS LIKE 'Mysqlx%compress%'";
+  cout << "Data is correct" << endl;
+
+  const char *query2 = (const char*)"SHOW STATUS LIKE 'Mysqlx_bytes%compress%'";
   CRUD_CHECK(res = mysqlx_sql(sess, query2, strlen(query2)), sess);
   int actual_row_count = 0;
   while ((row = mysqlx_row_fetch_one(res)) != NULL)
@@ -81,12 +98,15 @@ void check_compress(mysqlx_session_t *sess)
     ++actual_row_count;
 
     printf("%s : %s\n", buf1, buf2);
+    EXPECT_TRUE(std::stol((std::string)buf2, nullptr, 0) > 0);
   }
   printf("Status rows fetched: %i \n", actual_row_count);
   EXPECT_TRUE(actual_row_count > 0);
 };
 
-int check_compress2(mysqlx_session_t* m_sess) {
+
+int check_compress2(mysqlx_session_t* m_sess)
+{
   mysqlx_result_t* res = NULL;
   mysqlx_schema_t* schema;
   mysqlx_collection_t* collection;
@@ -114,12 +134,13 @@ int check_compress2(mysqlx_session_t* m_sess) {
   printf("\nInsert Success\n");
 
   return retVal;
-
 }
 
 
 TEST_F(xapi, compression_test)
 {
+  SKIP_IF_NO_XPLUGIN
+
   mysqlx_error_t *error;
   mysqlx_session_t *sess;
   mysqlx_session_options_t *opt;
@@ -179,6 +200,8 @@ TEST_F(xapi, compression_test)
 
 TEST_F(xapi, compression_test_doc)
 {
+  SKIP_IF_NO_XPLUGIN
+
   mysqlx_session_t* sess = NULL;
   mysqlx_error_t *error = NULL;
   std::string uri = get_basic_uri() + "?compression=PREFERRED";
@@ -2725,7 +2748,7 @@ TEST_F(xapi, tls_ver_ciphers)
       size_t sz = sizeof(buf);
       mysqlx_get_bytes(row, 1, 0, buf, &sz);
       printf("Mysqlx_ssl_cipher=%s\n", buf);
-      EXPECT_NO_THROW(suites_map.at(buf));
+      EXPECT_NO_THROW((void)suites_map.at(buf));
     }
 
     mysqlx_free_options(opt);