Create que_types library

storage/innobase/include/que0types.h

@@ -35,34 +35,18 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/univ/univ.h>
 
-#include <innodb/data_types/dfield_t.h>
+
 
 #include "btr0types.h"
 
 
-/* Pseudotype for all graph nodes */
-typedef void que_node_t;
+#include <innodb/que_types/que_common_t.h>
 
 /* Query graph root is a fork node */
 typedef struct que_fork_t que_t;
 
 struct que_thr_t;
 
-/* Common struct at the beginning of each query graph node; the name of this
-substruct must be 'common' */
-
-struct que_common_t {
-  ulint type;          /*!< query node type */
-  que_node_t *parent;  /*!< back pointer to parent node, or NULL */
-  que_node_t *brother; /* pointer to a possible brother node */
-  dfield_t val;        /*!< evaluated value for an expression */
-  ulint val_buf_size;
-  /* buffer size for the evaluated value data,
-  if the buffer has been allocated dynamically:
-  if this field is != 0, and the node is a
-  symbol node or a function node, then we
-  have to free the data field in val
-  explicitly */
-};
+
 
 #endif

storage/innobase/libs/CMakeLists.txt

@@ -65,6 +65,8 @@ add_subdirectory( memory_check )
 add_subdirectory( monitor )
 add_subdirectory( mtr )
 
+add_subdirectory( que_types )
+
 add_subdirectory( page )
 add_subdirectory( pfs )
 add_subdirectory( print )

storage/innobase/libs/que_types/CMakeLists.txt

@@ -0,0 +1,3 @@
+add_subdirectory( src )
+add_subdirectory( tests )
+

storage/innobase/libs/que_types/include/innodb/que_types/que_common_t.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include <innodb/univ/univ.h>
+
+#include <innodb/data_types/dfield_t.h>
+#include <innodb/que_types/que_node_t.h>
+
+/* Common struct at the beginning of each query graph node; the name of this
+substruct must be 'common' */
+struct que_common_t {
+  ulint type;          /*!< query node type */
+  que_node_t *parent;  /*!< back pointer to parent node, or NULL */
+  que_node_t *brother; /* pointer to a possible brother node */
+  dfield_t val;        /*!< evaluated value for an expression */
+  ulint val_buf_size;
+  /* buffer size for the evaluated value data,
+  if the buffer has been allocated dynamically:
+  if this field is != 0, and the node is a
+  symbol node or a function node, then we
+  have to free the data field in val
+  explicitly */
+};

storage/innobase/libs/que_types/include/innodb/que_types/que_node_t.h

@@ -0,0 +1,6 @@
+#pragma once
+
+#include <innodb/univ/univ.h>
+
+/* Pseudotype for all graph nodes */
+typedef void que_node_t;

storage/innobase/libs/que_types/src/CMakeLists.txt

@@ -0,0 +1,22 @@
+set( LIB_NAME que_types )
+
+add_library( ${LIB_NAME} STATIC
+    que_common_t.cpp
+    que_node_t.cpp
+)
+
+target_compile_options( ${LIB_NAME} PRIVATE  )
+
+target_include_directories(
+    ${LIB_NAME}
+    PUBLIC
+    ${CMAKE_CURRENT_SOURCE_DIR}/../include
+)
+
+target_link_libraries(
+    ${LIB_NAME}
+    PUBLIC
+    data_types
+    PRIVATE
+)
+

storage/innobase/libs/que_types/src/que_common_t.cpp

@@ -0,0 +1 @@
+#include <innodb/que_types/que_common_t.h>

storage/innobase/libs/que_types/src/que_node_t.cpp

@@ -0,0 +1 @@
+#include <innodb/que_types/que_node_t.h>

storage/innobase/libs/que_types/tests/CMakeLists.txt

@@ -0,0 +1,16 @@
+set( TEST_NAME que_types-utests )
+
+add_executable( ${TEST_NAME}
+    base.cpp
+    main.cpp
+)
+
+add_test( NAME ${TEST_NAME} COMMAND ${TEST_NAME} )
+
+target_compile_options( ${TEST_NAME} PRIVATE  )
+
+target_include_directories( ${TEST_NAME} PRIVATE )
+
+target_link_libraries( ${TEST_NAME} PRIVATE gtest que_types )
+
+

storage/innobase/libs/que_types/tests/base.cpp

@@ -0,0 +1,12 @@
+#include <gtest/gtest.h>
+// #include <innodb/que_types/que_types.h>
+
+
+//
+//
+TEST( que_types, constructor )
+{
+
+}
+
+

storage/innobase/libs/que_types/tests/main.cpp

@@ -0,0 +1,9 @@
+#include <gtest/gtest.h>
+
+int main( int argc, char **argv ) 
+{
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}
+
+

storage/innobase/libs/trx_trx/src/CMakeLists.txt

@@ -129,6 +129,7 @@ target_link_libraries(
     io
     lock_types
     log_sn
+    que_types
     read
     string
     trx_sys