Cubrid histogram

CMakeLists.txt

@@ -403,6 +403,7 @@ set(PARALLEL_QUERY_DIR       ${CMAKE_SOURCE_DIR}/src/query/parallel)
 set(PARALLEL_HASH_JOIN_DIR   ${CMAKE_SOURCE_DIR}/src/query/parallel/px_hash_join)
 set(PARALLEL_HEAP_SCAN_DIR    ${CMAKE_SOURCE_DIR}/src/query/parallel/px_heap_scan)
 set(PARALLEL_QUERY_EXECUTE_DIR ${CMAKE_SOURCE_DIR}/src/query/parallel/px_query_execute)
+set(HISTOGRAM_DIR            ${CMAKE_SOURCE_DIR}/src/histogram)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(
@@ -434,6 +435,7 @@ include_directories(
   src/query/parallel/px_heap_scan
   src/query/parallel
   src/query/parallel/px_query_execute
+  src/histogram
   )
 if(WITH_CCI)
   include_directories(

cs/CMakeLists.txt

@@ -427,6 +427,18 @@ set(PARALLEL_QUERY_EXECUTE_HEADERS
   ${PARALLEL_QUERY_EXECUTE_DIR}/px_query_checker.hpp
   )
 
+set (HISTOGRAM_SOURCES
+  ${HISTOGRAM_DIR}/histogram_cl.cpp
+  ${HISTOGRAM_DIR}/histogram_builder.cpp
+  ${HISTOGRAM_DIR}/histogram_reader.cpp
+  )
+
+set (HISTOGRAM_HEADERS
+  ${HISTOGRAM_DIR}/histogram_cl.hpp
+  ${HISTOGRAM_DIR}/histogram_builder.hpp
+  ${HISTOGRAM_DIR}/histogram_reader.hpp
+  )
+
 list(APPEND CONNECTION_SOURCES ${CONNECTION_DIR}/heartbeat.c)
 if(UNIX)
   list(APPEND EXECUTABLE_SOURCES ${EXECUTABLES_DIR}/checksumdb.c)
@@ -512,6 +524,7 @@ SET_SOURCE_FILES_PROPERTIES(
   ${API_SOURCES}
   ${PARALLEL_HEAP_SCAN_SOURCES}
   ${PARALLEL_QUERY_EXECUTE_SOURCES}
+  ${HISTOGRAM_SOURCES}
   PROPERTIES LANGUAGE CXX
   )
 SET_SOURCE_FILES_PROPERTIES(
@@ -558,6 +571,8 @@ add_library(cubridcs SHARED
   ${PARALLEL_HEAP_SCAN_HEADERS}
   ${PARALLEL_QUERY_EXECUTE_SOURCES}
   ${PARALLEL_QUERY_EXECUTE_HEADERS}
+  ${HISTOGRAM_SOURCES}
+  ${HISTOGRAM_HEADERS}
   )
 set_target_properties(cubridcs PROPERTIES SOVERSION "${CUBRID_MAJOR_VERSION}.${CUBRID_MINOR_VERSION}")
 

sa/CMakeLists.txt

@@ -543,6 +543,17 @@ set(XASL_HEADERS
   ${XASL_DIR}/xasl_iteration.hpp
   )
 
+set(HISTOGRAM_SOURCES
+  ${HISTOGRAM_DIR}/histogram_cl.cpp
+  ${HISTOGRAM_DIR}/histogram_reader.cpp
+  ${HISTOGRAM_DIR}/histogram_builder.cpp
+)
+set(HISTOGRAM_HEADERS
+  ${HISTOGRAM_DIR}/histogram_cl.hpp
+  ${HISTOGRAM_DIR}/histogram_reader.hpp
+  ${HISTOGRAM_DIR}/histogram_builder.hpp
+)
+
 set(LOADDB_SOURCES
   ${BISON_loader_grammar_OUTPUT_SOURCE}
   ${FLEX_loader_lexer_OUTPUTS}
@@ -645,6 +656,7 @@ SET_SOURCE_FILES_PROPERTIES(
   ${PROBES_OBJECT}
   ${XASL_SOURCES}
   ${LOADDB_SOURCES}
+  ${HISTOGRAM_SOURCES}
   PROPERTIES LANGUAGE CXX
   )
 
@@ -698,6 +710,8 @@ add_library(cubridsa SHARED
   ${XASL_SOURCES}
   ${LOADDB_SOURCES}
   ${LOADDB_HEADERS}
+  ${HISTOGRAM_SOURCES}
+  ${HISTOGRAM_HEADERS}
   )
 set_target_properties(cubridsa PROPERTIES SOVERSION "${CUBRID_MAJOR_VERSION}.${CUBRID_MINOR_VERSION}")
 

src/base/ddl_log.c

@@ -1433,6 +1433,8 @@ logddl_is_ddl_type (int node_type, PT_NODE * node)
     case PT_CREATE_ENTITY:
     case PT_CREATE_INDEX:
     case PT_CREATE_SERIAL:
+    case PT_UPDATE_HISTOGRAM:
+    case PT_DROP_HISTOGRAM:
     case PT_CREATE_STORED_PROCEDURE:
     case PT_CREATE_SYNONYM:
     case PT_CREATE_TRIGGER:

src/compat/dbi_compat.h

@@ -63,6 +63,8 @@ extern "C"
 #define SQLX_CMD_REGISTER_DATABASE   CUBRID_STMT_REGISTER_DATABASE
 #define SQLX_CMD_CREATE_CLASS   CUBRID_STMT_CREATE_CLASS
 #define SQLX_CMD_CREATE_INDEX   CUBRID_STMT_CREATE_INDEX
+#define SQLX_CMD_UPDATE_HISTOGRAM   CUBRID_STMT_UPDATE_HISTOGRAM
+#define SQLX_CMD_DROP_HISTOGRAM   CUBRID_STMT_DROP_HISTOGRAM
 #define SQLX_CMD_CREATE_TRIGGER   CUBRID_STMT_CREATE_TRIGGER
 #define SQLX_CMD_CREATE_SERIAL   CUBRID_STMT_CREATE_SERIAL
 #define SQLX_CMD_DROP_DATABASE   CUBRID_STMT_DROP_DATABASE

src/compat/dbtype_def.h

@@ -119,7 +119,8 @@ extern "C"
     CUBRID_STMT_ALTER_USER,
     CUBRID_STMT_SET_SYS_PARAMS,
     CUBRID_STMT_ALTER_INDEX,
-
+    CUBRID_STMT_UPDATE_HISTOGRAM,
+    CUBRID_STMT_DROP_HISTOGRAM,
     CUBRID_STMT_CREATE_STORED_PROCEDURE,
     CUBRID_STMT_DROP_STORED_PROCEDURE,
     CUBRID_STMT_PREPARE_STATEMENT,

src/executables/csql_result.c

@@ -108,6 +108,8 @@ static CSQL_CMD_STRING_TABLE csql_Cmd_string_table[] = {
   {CUBRID_STMT_ROLLBACK_WORK, "ROLLBACK"},
   {CUBRID_STMT_GRANT, "GRANT"},
   {CUBRID_STMT_REVOKE, "REVOKE"},
+  {CUBRID_STMT_UPDATE_HISTOGRAM, "ANALYZE UPDATE HISTOGRAM"},
+  {CUBRID_STMT_DROP_HISTOGRAM, "ANALYZE DROP HISTOGRAM"},
   {CUBRID_STMT_CREATE_USER, "CREATE USER"},
   {CUBRID_STMT_DROP_USER, "DROP USER"},
   {CUBRID_STMT_ALTER_USER, "ALTER USER"},

src/executables/unload_object.c

@@ -139,6 +139,7 @@ static const char *prohibited_classes[] = {
   CT_DUAL_NAME,
   CT_SERVER_NAME,
   CT_SYNONYM_NAME,
+  CT_DB_HISTOGRAM_NAME,
   /* catalog vclasses */
   CTV_CLASS_NAME,
   CTV_SUPER_CLASS_NAME,
@@ -162,6 +163,7 @@ static const char *prohibited_classes[] = {
   CTV_CHARSET_NAME,
   CTV_SERVER_NAME,
   CTV_SYNONYM_NAME,
+  CTV_DB_HISTOGRAM_NAME,
   NULL
 };