Merge branch 'develop' of http://github.com/cubrid/cubrid into develop

CMakeLists.txt

@@ -487,7 +487,7 @@ set(THREAD_DIR               ${CMAKE_SOURCE_DIR}/src/thread)
 set(TOOLS_DIR                ${CMAKE_SOURCE_DIR}/src/tools)
 set(TRANSACTION_DIR          ${CMAKE_SOURCE_DIR}/src/transaction)
 set(WIN_TOOLS_DIR            ${CMAKE_SOURCE_DIR}/src/win_tools)
-
+set(XASL_DIR                 ${CMAKE_SOURCE_DIR}/src/xasl)
 
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 include_directories(
@@ -513,6 +513,7 @@ include_directories(
   src/thread
   src/tools
   src/transaction
+  src/xasl
   )
 
 include(CheckFunctionExists)

cs/CMakeLists.txt

@@ -247,6 +247,16 @@ set(STORAGE_SOURCES
   ${STORAGE_DIR}/es.c
   ${STORAGE_DIR}/es_posix.c
   )
+
+set(XASL_SOURCES
+  ${XASL_DIR}/access_json_table.cpp
+  ${XASL_DIR}/xasl_stream.cpp
+  )
+set(XASL_HEADERS
+  ${XASL_DIR}/access_json_table.hpp
+  ${XASL_DIR}/compile_context.h
+  ${XASL_DIR}/xasl_stream.hpp
+  )
 
 list(APPEND CONNECTION_SOURCES ${CONNECTION_DIR}/heartbeat.c)
 if(UNIX)
@@ -325,6 +335,7 @@ SET_SOURCE_FILES_PROPERTIES(
   ${STORAGE_SOURCES}
   ${ES_SOURCES}
   ${PROBES_OBJECT}
+  ${XASL_SOURCES}
   PROPERTIES LANGUAGE CXX
   )
 SET_SOURCE_FILES_PROPERTIES(
@@ -358,6 +369,8 @@ add_library(cubridcs SHARED
   ${STORAGE_SOURCES}
   ${ES_SOURCES}
   ${PROBES_OBJECT}
+  ${XASL_SOURCES}
+  ${XASL_HEADERS}
   )
 set_target_properties(cubridcs PROPERTIES SOVERSION "${CUBRID_MAJOR_VERSION}.${CUBRID_MINOR_VERSION}")
 

cubrid/CMakeLists.txt

@@ -211,6 +211,7 @@ set(QUERY_SOURCES
   ${QUERY_DIR}/query_executor.c
   ${QUERY_DIR}/query_manager.c
   ${QUERY_DIR}/query_opfunc.c
+  ${QUERY_DIR}/scan_json_table.cpp
   ${QUERY_DIR}/scan_manager.c
   ${QUERY_DIR}/serial.c
   ${QUERY_DIR}/set_scan.c
@@ -220,6 +221,9 @@ set(QUERY_SOURCES
   ${QUERY_DIR}/vacuum.c
   ${QUERY_DIR}/xasl_cache.c
   )
+set(QUERY_HEADERS
+  ${QUERY_DIR}/scan_json_table.hpp
+  )
 
 set(OBJECT_SOURCES
   ${OBJECT_DIR}/elo.c
@@ -294,6 +298,16 @@ set(SESSION_SOURCES
   ${SESSION_DIR}/session_sr.c
   )
 
+set(XASL_SOURCES
+  ${XASL_DIR}/access_json_table.cpp
+  ${XASL_DIR}/xasl_stream.cpp
+  )
+set(XASL_HEADERS
+  ${XASL_DIR}/access_json_table.hpp
+  ${XASL_DIR}/compile_context.h
+  ${XASL_DIR}/xasl_stream.hpp
+  )
+
 list(APPEND CONNECTION_SOURCES ${CONNECTION_DIR}/heartbeat.c)
 if(UNIX)
   list(APPEND BASE_SOURCES ${BASE_DIR}/cubrid_getopt_long.c)
@@ -332,6 +346,7 @@ SET_SOURCE_FILES_PROPERTIES(
   ${STORAGE_SOURCES}
   ${THREAD_SOURCES}
   ${TRANSACTION_SOURCES}
+  ${XASL_SOURCES}
   PROPERTIES LANGUAGE CXX
   )
 
@@ -360,16 +375,19 @@ set (CUBRID_LIB_SOURCES
   ${STREAM_SOURCES}
   ${THREAD_SOURCES}
   ${TRANSACTION_SOURCES}
+  ${XASL_SOURCES}
   )
 
 set (CUBRID_LIB_HEADERS
   ${BASE_HEADERS}
   ${COMMUNICATION_HEADERS}
   ${COMPAT_HEADERS}
   ${MONITOR_HEADERS}
+  ${QUERY_HEADERS}
   ${REPLICATION_HEADERS}
   ${THREAD_HEADERS}
   ${STREAM_HEADERS}
+  ${XASL_HEADERS}
   )
 
 add_library(cubrid SHARED
@@ -453,6 +471,9 @@ install(FILES
 install(FILES
   ${COMPAT_DIR}/dbtype_def.h
   ${COMPAT_DIR}/dbtype_function.h
+  ${COMPAT_DIR}/db_date.h
+  ${COMPAT_DIR}/db_elo.h
+  ${COMPAT_DIR}/cache_time.h
   DESTINATION ${CUBRID_INCLUDEDIR} COMPONENT Header  
   )
 install(FILES

msg/de_DE.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 Letzter Fehler
+1240 Letzter Fehler
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Fehler in Fehler-Subsystem (Zeile %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 ungültige Verwendung von sessiontimezone\n sessiontimezone
 126 Maximale Länge einer class/vclass Kommentar ist %1$d bytes.
 127 Maximale Länge eines Kommentars ist %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Außer Speicher.

msg/en_US.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s".
 
-1238 Last Error
+1240 Last Error
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Error in error subsystem (line %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 invalid use of sessiontimezone\n sessiontimezone
 126 Maximum length of a class/vclass comment is %1$d bytes.
 127 Maximum length of a comment is %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Out of memory.

msg/en_US/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s".
 
-1238 Last Error
+1240 Last Error
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Error in error subsystem (line %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 invalid use of sessiontimezone\n sessiontimezone
 126 Maximum length of a class/vclass comment is %1$d bytes.
 127 Maximum length of a comment is %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Out of memory.

msg/es_ES.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 Last Error
+1240 Last Error
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Error en subsistema de error (linea %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 uso invalido de sessiontimezone\n sessiontimezone
 126 Longitud maxima de un comentario class/vclass es %1$d bytes.
 127 Longitud maxima de un comentario es %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Sin memoria.

msg/fr_FR.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 Dernière erreur
+1240 Dernière erreur
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Erreur dans le sous-système d'erreur (ligne %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 Utilisation non valide de sessiontimezone\n sessiontimezone
 126 La dimension maximale d'un commentaire class/vclass est %1$d octets.
 127 La dimension maximale d'un commentaire est %1$d octets.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Mémoire épuisée.

msg/it_IT.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s".
 
-1238 Ultimo errore
+1240 Ultimo errore
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Errore nel sottosistema di errore (linea %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 uso non valido di sessiontimezone\n sessiontimezone
 126 Lunghezza massima di class/vclass comment è %1$d bytes.
 127 Lunghezza massima di un commento è %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Memoria esaurita.

msg/ja_JP.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 ラストエラー
+1240 ラストエラー
 
 $set 6 MSGCAT_SET_INTERNAL
 1 エラーサブシステムにエラー発生(ライン %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 sessiontimezoneの使用が無効です\n sessiontimezone
 126 class/vclassコメントの最大長は%1$dバイトです。
 127 コメントの最大長は%1$dバイトです。
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 メモリーが足りません。

msg/km_KH.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s".
 
-1238 Last Error
+1240 Last Error
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Error in error subsystem (line %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 invalid use of sessiontimezone\n sessiontimezone
 126 Maximum length of a class/vclass comment is %1$d bytes.
 127 Maximum length of a comment is %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Out of memory.

msg/ko_KR.euckr/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 ������ ����
+1240 ������ ����
 
 $set 6 MSGCAT_SET_INTERNAL
 1 ���� ���� �ý��ۿ� ���� �߻�(���� %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 �߸��� ������ sessiontimezone\n sessiontimezone
 126 ���̺��� �� Ŀ��Ʈ�� �ִ� ���̴� %1$d ����Ʈ�Դϴ�.
 127 Ŀ��Ʈ�� �ִ� ���̴� %1$d ����Ʈ�Դϴ�.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 �޸𸮰� �����մϴ�

msg/ko_KR.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 마지막 에러
+1240 마지막 에러
 
 $set 6 MSGCAT_SET_INTERNAL
 1 에러 서브 시스템에 에러 발생(라인 %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 잘못된 형식의 sessiontimezone\n sessiontimezone
 126 테이블과 뷰 커맨트의 최대 길이는 %1$d 바이트입니다.
 127 커맨트의 최대 길이는 %1$d 바이트입니다.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 메모리가 부족합니다

msg/ro_RO.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer este dezactivat.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s".
 
-1238 Ultima eroare
+1240 Ultima eroare
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Eroare în subsistemul de erori (linia %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 utilizare invalidă a sessiontimezone sessiontimezone\n
 126 Lungimea maximă a comentariilor class/vclass este %1$d bytes.
 127 Lungimea maximă a comentariilor este %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Memorie epuizată.

msg/tr_TR.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s".
 
-1238 Son Hata
+1240 Son Hata
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Alt Hata içinde hata (satır %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 sessiontimezone geçersiz kullanımı\n sessiontimezone
 126 Bir class/vclass yorumun maksimum uzunluğu %1$d byte.
 127 Bir yorumun maksimum uzunluğu %1$d byte.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Bellek yetersiz.

msg/vi_VN.utf8/cubrid.msg

@@ -1304,8 +1304,10 @@ $ LOADDB
 1235 Reserved error for stream/replication.
 1236 Double Write Buffer is disabled.
 1237 Cannot change status on %1$s because %2$s is a %3$s.
+1238 Missing value for JSON_TABLE column '%1$s'.
+1239 Cannot coerce value from JSON "%1$s" at path "%2$s" to JSON_TABLE column "%3$s" of domain "%4$s". 
 
-1238 Last Error
+1240 Last Error
 
 $set 6 MSGCAT_SET_INTERNAL
 1 Error in error subsystem (line %1$d):
@@ -1461,6 +1463,7 @@ $set 7 MSGCAT_SET_PARSER_SYNTAX
 125 invalid use of sessiontimezone\n sessiontimezone
 126 Maximum length of a class/vclass comment is %1$d bytes.
 127 Maximum length of a comment is %1$d bytes.
+128 Invalid number of arguments for JSON_OBJECTAGG
 
 $set 8 MSGCAT_SET_PARSER_SEMANTIC
 1 Out of memory.