Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into update_jdbc_version
Browse files Browse the repository at this point in the history
  • Loading branch information
airnet73 committed Dec 16, 2024
2 parents 1d9e21c + 89db307 commit 8c1d7a8
Show file tree
Hide file tree
Showing 310 changed files with 17,815 additions and 10,945 deletions.
8 changes: 5 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ jobs:
build:
<<: *defaults
environment:
MAKEFLAGS: -j 10
resource_class: large
MAKEFLAGS: -j 8
resource_class: xlarge
steps:
- checkout
- run:
Expand Down Expand Up @@ -149,4 +149,6 @@ workflows:
requires:
- build

- build-windows
- build-windows:
requires:
- build
3 changes: 2 additions & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
/src/broker/ @kisoo-han
/src/cm_common/ @kisoo-han
/src/compat/ @beyondykk9
/src/jsp/ @beyondykk9
/src/sp/ @beyondykk9
/src/method/ @beyondykk9
/src/optimizer/ @shparkcubrid
/src/parser/ @beyondykk9
Expand Down Expand Up @@ -51,3 +51,4 @@
/src/thread @beyondykk9
/src/loaddb @kisoo-han

/pl_engine @beyondykk9
30 changes: 21 additions & 9 deletions 3rdparty/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ set(WITH_RAPIDJSON_URL "https://github.com/CUBRID/3rdparty/raw/develop/rapidjson
set(WITH_LIBOPENSSL_URL "https://github.com/CUBRID/3rdparty/raw/develop/openssl/openssl-1.1.1f.tar.gz") # openssl library sources URL
set(WITH_LIBUNIXODBC_URL "https://github.com/CUBRID/3rdparty/raw/develop/unixODBC/unixODBC-2.3.9.tar.gz") # unixODBC library sources URL
set(WITH_LIBTBB_URL "https://github.com/CUBRID/3rdparty/raw/develop/tbb/v2021.11.0.tar.gz") # intel oneTBB library sources URL
set(WITH_RE2_URL "https://github.com/CUBRID/3rdparty/raw/develop/re2/2022-06-01.tar.gz") # RE2
set(WITH_LZ4_URL "https://github.com/CUBRID/3rdparty/raw/develop/lz4/v1.9.2.tar.gz") # LZ4
set(WIN_FLEX_BISON_URL "https://github.com/CUBRID/3rdparty/raw/develop/win_flex_bison/win_flex_bison-2.5.22.zip") # Windows

# URL_HASH is a hash value used to verify the integrity of a file downloaded from a specified URL.
# It is optional but highly recommended to set this value. If not set, the file will be downloaded
Expand All @@ -47,6 +50,9 @@ set(WITH_RAPIDJSON_URL_HASH "SHA256=bf7ced29704a1e696fbccf2a2b4ea068e7774fa37f6d
set(WITH_LIBOPENSSL_URL_HASH "SHA256=186c6bfe6ecfba7a5b48c47f8a1673d0f3b0e5ba2e25602dd23b629975da3f35") # openssl library sources URL
set(WITH_LIBUNIXODBC_URL_HASH "SHA256=52833eac3d681c8b0c9a5a65f2ebd745b3a964f208fc748f977e44015a31b207") # unixODBC library sources URL
set(WITH_LIBTBB_URL_HASH "SHA256=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363") # intel oneTBB library sources URL
set(WITH_LIBTBB_URL_HASH "SHA256=782ce0cab62df9ea125cdea253a50534862b563f1d85d4cda7ad4e77550ac363") # intel oneTBB library sources URL
set(WITH_RE2_URL_HASH "SHA256=f89c61410a072e5cbcf8c27e3a778da7d6fd2f2b5b1445cd4f4508bee946ab0f")
set(WITH_LZ4_URL_HASH "SHA256=658ba6191fa44c92280d4aa2c271b0f4fbc0e34d249578dd05e50e76d0e5efcc")


# options for external libraries (BUNDLED, EXTERAL or SYSTEM)
Expand All @@ -66,6 +72,7 @@ set(WITH_LIBEDIT "${WITH_EXTERNAL_PREFIX}" CACHE STRING "Build with editlin
set(WITH_LIBOPENSSL "${WITH_EXTERNAL_PREFIX}" CACHE STRING "Build with openssl library (default: EXTERNAL)")
set(WITH_LIBUNIXODBC "${WITH_EXTERNAL_PREFIX}" CACHE STRING "Build with unixODBC library (default: EXTERNAL)")
set(WITH_RE2 "${WITH_EXTERNAL_PREFIX}" CACHE STRING "Build with re2 library (default: EXTERNAL)")
set(WITH_LZ4 "${WITH_EXTERNAL_PREFIX}" CACHE STRING "Build with lz4 library (default: EXTERNAL)")
set(WITH_LIBTBB "${WITH_EXTERNAL_PREFIX}" CACHE STRING "Build with TBB library (default: EXTERNAL)")

message(STATUS "Build with flex and bison library: ${WITH_LIBFLEXBISON}")
Expand All @@ -75,6 +82,7 @@ message(STATUS "Build with editline library: ${WITH_LIBEDIT}")
message(STATUS "Build with openssl library: ${WITH_LIBOPENSSL}")
message(STATUS "Build with unixODBC library: ${WITH_LIBUNIXODBC}")
message(STATUS "Build with RE2 library: ${WITH_RE2}")
message(STATUS "Build with LZ4 library: ${WITH_LZ4}")
message(STATUS "Build with TBB library: ${WITH_LIBTBB}")

macro(ADD_BY_PRODUCTS_VARIABLE prefix_dependee)
Expand Down Expand Up @@ -114,10 +122,8 @@ endif(WIN32)
if(WITH_LIBFLEXBISON STREQUAL "EXTERNAL")
if(WIN32)
# bison and flex for Windows
set(WIN_FLEX_BISON_VERSION "2.5.22")
set(WIN_FLEX_BISON_URL "https://github.com/lexxmark/winflexbison/releases/download/v${WIN_FLEX_BISON_VERSION}/win_flex_bison-${WIN_FLEX_BISON_VERSION}.zip")
set(WIN_FLEX_BISON_FILENAME "${WINDOWS_EXTERNAL_DIR}/Download/win_flex_bison.zip")
file(DOWNLOAD ${WIN_FLEX_BISON_URL} ${WIN_FLEX_BISON_FILENAME})
file(DOWNLOAD ${WIN_FLEX_BISON_URL} ${WIN_FLEX_BISON_FILENAME} INACTIVITY_TIMEOUT 600)

set(WIN_FLEX_BISON_INSTALL_DIR "${WINDOWS_EXTERNAL_DIR}/Install/win_flex_bison")
file(MAKE_DIRECTORY ${WIN_FLEX_BISON_INSTALL_DIR})
Expand Down Expand Up @@ -326,11 +332,14 @@ else()
set(LZ4_LIBS ${3RDPARTY_LIBS_DIR}/Source/lz4/lib/liblz4.a)
ADD_BY_PRODUCTS_VARIABLE ("LZ4" ${LZ4_LIBS})
externalproject_add(${LZ4_TARGET}
GIT_REPOSITORY https://github.com/lz4/lz4
GIT_TAG fdf2ef5 # https://github.com/lz4/lz4/releases/tag/v1.9.2
URL ${WITH_LZ4_URL}
URL_HASH ${WITH_LZ4_URL_HASH}
TIMEOUT 600
LOG_BUILD TRUE
DOWNLOAD_NO_PROGRESS 1
CONFIGURE_COMMAND "" # no configure
BUILD_IN_SOURCE true # lz4 Makefile is designed to run locally
BUILD_COMMAND make CFLAGS="-fPIC" # to allow static linking in shared library
BUILD_COMMAND make CFLAGS=-fPIC # to allow static linking in shared library
INSTALL_COMMAND "" # suppress install
"${LZ4_BYPRODUCTS}"
)
Expand Down Expand Up @@ -457,11 +466,14 @@ if(WITH_RE2 STREQUAL "EXTERNAL")
set(RE2_LIBS ${3RDPARTY_LIBS_DIR}/Source/re2/obj/libre2.a)
ADD_BY_PRODUCTS_VARIABLE ("RE2" ${RE2_LIBS})
externalproject_add(${RE2_TARGET}
GIT_REPOSITORY https://github.com/google/re2
GIT_TAG 5723bb8 # https://github.com/google/re2/releases/tag/2022-06-01
URL ${WITH_RE2_URL}
URL_HASH ${WITH_RE2_URL_HASH}
TIMEOUT 600
LOG_BUILD TRUE
DOWNLOAD_NO_PROGRESS 1
CONFIGURE_COMMAND "" # no configure
BUILD_IN_SOURCE true # re2 Makefile is designed to run locally
BUILD_COMMAND make CFLAGS="-fPIC" CXXFLAGS="-fPIC" # to allow static linking in shared library
BUILD_COMMAND make CFLAGS=-fPIC CXXFLAGS=-fPIC # to allow static linking in shared library
INSTALL_COMMAND ""
"${RE2_BYPRODUCTS}"
)
Expand Down
10 changes: 7 additions & 3 deletions contrib/msg/de_DE.utf8/cubrid.msg
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,9 @@ $ LOADDB

1359 Java VM crashed: %1$s
1360 In line %1$d, column %2$d\nStored procedure compile error: %3$s

1361 Letzter Fehler
1361 Dropping system generated stored procedure is not allowed.
1362 PL/CSQL Stored procedure/function does not support Invoker's rights
1363 Letzter Fehler

$set 6 MSGCAT_SET_INTERNAL
1 Fehler in Fehler-Subsystem (Zeile %1$d):
Expand Down Expand Up @@ -1937,7 +1938,10 @@ $set 8 MSGCAT_SET_PARSER_SEMANTIC
320 Unsupported return type '%1$s' of the stored procedure
321 %TYPE type specification is allowed only for PL/CSQL
322 Table column '%1$s.%2$s' has not been defined
323 Stored procedure/function '%1$s' has OUT or IN OUT arguments
323 Stored procedure/function "%1$s" does not exist.
324 Attempting to assign DEFAULT on an Out parameter is not allowed: '%1$s'.
325 Only trailing default parameter is allowed: invalid at '%1$s'.
326 Stored procedure/function '%1$s' has OUT or IN OUT arguments

$set 9 MSGCAT_SET_PARSER_RUNTIME
1 Außer virtuellem Speicher: %1$d Bytes können nicht zugewiesen werden.
Expand Down
6 changes: 2 additions & 4 deletions contrib/msg/de_DE.utf8/utils.msg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Vorhandene Serviceutilities:\n\
gateway\n\
manager\n\
heartbeat\n\
javasp\n\
pl\n\
\n\
Vorhandene Administratorutilities:\n\
addvoldb\n\
Expand Down Expand Up @@ -262,11 +262,9 @@ Vorhandene Befehle:\n\
42 Parameter ist Ungültig.\n
43 Datei(%1$s) offene Fehler.\n
44 Cubrid Utility, Version %1$s\n\
Anwendung: %2$s javasp <Befehl> [args]\n\
Anwendung: %2$s pl <Befehl> [args]\n\
\n\
Vorhandene Befehle:\n\
start [database-name]\n\
stop [database-name]\n\
restart [database-name]\n\
status [database-name]\n
45 cubrid utility, version %1$s\n\
Expand Down
10 changes: 7 additions & 3 deletions contrib/msg/es_ES.utf8/cubrid.msg
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,9 @@ Verifique la ruta del archivo de claves (_keys) y asegúrese de que incluya la c

1359 Java VM crashed: %1$s
1360 In line %1$d, column %2$d\nStored procedure compile error: %3$s

1361 Ultimo error
1361 Dropping system generated stored procedure is not allowed.
1362 PL/CSQL Stored procedure/function does not support Invoker's rights
1363 Ultimo error

$set 6 MSGCAT_SET_INTERNAL
1 Error en subsistema de error (linea %1$d):
Expand Down Expand Up @@ -1937,7 +1938,10 @@ $set 8 MSGCAT_SET_PARSER_SEMANTIC
320 Unsupported return type '%1$s' of the stored procedure
321 %TYPE type specification is allowed only for PL/CSQL
322 Table column '%1$s.%2$s' has not been defined
323 Stored procedure/function '%1$s' has OUT or IN OUT arguments
323 Stored procedure/function "%1$s" does not exist.
324 Attempting to assign DEFAULT on an Out parameter is not allowed: '%1$s'.
325 Only trailing default parameter is allowed: invalid at '%1$s'.
326 Stored procedure/function '%1$s' has OUT or IN OUT arguments

$set 9 MSGCAT_SET_PARSER_RUNTIME
1 Sin memoria virtual: incapaz de asignar %1$d bytes.
Expand Down
6 changes: 2 additions & 4 deletions contrib/msg/es_ES.utf8/utils.msg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Utilidades de servicio disponible:\n\
gateway\n\
manager\n\
heartbeat\n\
javasp\n\
pl\n\
\n\
Utilidades de administrador disponible:\n\
addvoldb\n\
Expand Down Expand Up @@ -262,11 +262,9 @@ Comando disponible: \n\
42 Argumento invalido.\n
43 Error al abrir archivo (%1$s).\n
44 utilidad de cubrid, version %1$s\n\
uso: %2$s javasp <command> [args]\n\
uso: %2$s pl <command> [args]\n\
\n\
Comando disponible:\n\
start [database-name]\n\
stop [database-name]\n\
restart [database-name]\n\
status [database-name]\n
45 cubrid utility, version %1$s\n\
Expand Down
10 changes: 7 additions & 3 deletions contrib/msg/fr_FR.utf8/cubrid.msg
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,9 @@ Vérifiez le chemin du fichier de clé (_keys) et assurez-vous qu'il inclut la c

1359 Java VM crashed: %1$s
1360 In line %1$d, column %2$d\nStored procedure compile error: %3$s

1361 Dernière erreur
1361 Dropping system generated stored procedure is not allowed.
1362 PL/CSQL Stored procedure/function does not support Invoker's rights
1363 Dernière erreur

$set 6 MSGCAT_SET_INTERNAL
1 Erreur dans le sous-système d'erreur (ligne %1$d):
Expand Down Expand Up @@ -1937,7 +1938,10 @@ $set 8 MSGCAT_SET_PARSER_SEMANTIC
320 Unsupported return type '%1$s' of the stored procedure
321 %TYPE type specification is allowed only for PL/CSQL
322 Table column '%1$s.%2$s' has not been defined
323 Stored procedure/function '%1$s' has OUT or IN OUT arguments
323 Stored procedure/function "%1$s" does not exist.
324 Attempting to assign DEFAULT on an Out parameter is not allowed: '%1$s'.
325 Only trailing default parameter is allowed: invalid at '%1$s'.
326 Stored procedure/function '%1$s' has OUT or IN OUT arguments

$set 9 MSGCAT_SET_PARSER_RUNTIME
1 Mémoire virtuelle épuisée: impossible d'allouer %1$d octets.
Expand Down
6 changes: 2 additions & 4 deletions contrib/msg/fr_FR.utf8/utils.msg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Utilitaires de service disponibles\n\
gateway\n\
manager\n\
heartbeat\n\
javasp\n\
pl\n\
\n\
Utilitaires d'administrateur disponibles:\n\
addvoldb\n\
Expand Down Expand Up @@ -262,11 +262,9 @@ Commandes disponibles:\n\
42 Argument invalide.\n
43 Erreur d'ouverture du fichier(%1$s).\n
44 utilitaire CUBRID, version %1$s\n\
usage: %2$s javasp <command> [args]\n\
usage: %2$s pl <command> [args]\n\
\n\
Commandes disponibles:\n\
start [database-name]\n\
stop [database-name]\n\
restart [database-name]\n\
status [database-name]\n
45 cubrid utility, version %1$s\n\
Expand Down
10 changes: 7 additions & 3 deletions contrib/msg/it_IT.utf8/cubrid.msg
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,9 @@ Controllare il percorso del file della chiave (_keys) e assicurarsi che includa

1359 Java VM crashed: %1$s
1360 In line %1$d, column %2$d\nStored procedure compile error: %3$s

1361 Ultimo errore
1361 Dropping system generated stored procedure is not allowed.
1362 PL/CSQL Stored procedure/function does not support Invoker's rights
1363 Ultimo errore

$set 6 MSGCAT_SET_INTERNAL
1 Errore nel sottosistema di errore (linea %1$d):
Expand Down Expand Up @@ -1937,7 +1938,10 @@ $set 8 MSGCAT_SET_PARSER_SEMANTIC
320 Unsupported return type '%1$s' of the stored procedure
321 %TYPE type specification is allowed only for PL/CSQL
322 Table column '%1$s.%2$s' has not been defined
323 Stored procedure/function '%1$s' has OUT or IN OUT arguments
323 Stored procedure/function "%1$s" does not exist.
324 Attempting to assign DEFAULT on an Out parameter is not allowed: '%1$s'.
325 Only trailing default parameter is allowed: invalid at '%1$s'.
326 Stored procedure/function '%1$s' has OUT or IN OUT arguments

$set 9 MSGCAT_SET_PARSER_RUNTIME
1 Fuori di memoria virtuale: Impossibile allocare %1$d byte.
Expand Down
6 changes: 2 additions & 4 deletions contrib/msg/it_IT.utf8/utils.msg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Servizi disponibili:\n\
gateway\n\
manager\n\
heartbeat\n\
javasp\n\
pl\n\
\n\
Utilità amministrazione disponibili:\n\
addvoldb\n\
Expand Down Expand Up @@ -262,11 +262,9 @@ Commandi disponibili:\n\
42 Argomento non valido.\n
43 Errore di apertura file(%1$s).\n
44 utilità cubrid, versione %1$s\n\
uso: %2$s javasp <commando> [args]\n\
uso: %2$s pl <commando> [args]\n\
\n\
Commandi disponibili:\n\
start [database-name]\n\
stop [database-name]\n\
restart [database-name]\n\
status [database-name]\n
45 cubrid utility, version %1$s\n\
Expand Down
10 changes: 7 additions & 3 deletions contrib/msg/ja_JP.utf8/cubrid.msg
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,9 @@ $ LOADDB

1359 Java VM crashed: %1$s
1360 In line %1$d, column %2$d\nStored procedure compile error: %3$s

1361 ラストエラー
1361 Dropping system generated stored procedure is not allowed.
1362 PL/CSQL Stored procedure/function does not support Invoker's rights
1363 ラストエラー

$set 6 MSGCAT_SET_INTERNAL
1 エラーサブシステムにエラー発生(ライン %1$d):
Expand Down Expand Up @@ -1937,7 +1938,10 @@ $set 8 MSGCAT_SET_PARSER_SEMANTIC
320 Unsupported return type '%1$s' of the stored procedure
321 %TYPE type specification is allowed only for PL/CSQL
322 Table column '%1$s.%2$s' has not been defined
323 Stored procedure/function '%1$s' has OUT or IN OUT arguments
323 Stored procedure/function "%1$s" does not exist.
324 Attempting to assign DEFAULT on an Out parameter is not allowed: '%1$s'.
325 Only trailing default parameter is allowed: invalid at '%1$s'.
326 Stored procedure/function '%1$s' has OUT or IN OUT arguments

$set 9 MSGCAT_SET_PARSER_RUNTIME
1 バチャールメモリーが足りません。: %1$dバイトがアロケーションできません。
Expand Down
6 changes: 2 additions & 4 deletions contrib/msg/ja_JP.utf8/utils.msg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ cubrid 管理者ユーティリティー、バージョン %1$s\n\
gateway\n\
manager\n\
heartbeat\n\
javasp\n\
pl\n\
\n\
正しい管理者ユーティリティー名:\n\
addvoldb\n\
Expand Down Expand Up @@ -262,11 +262,9 @@ cubrid 管理者ユーティリティー、バージョン %1$s\n\
42 無効なパラメーターです。\n
43 ファイル「%1$s」のオープンに失敗しました。\n
44 cubridユーティリティー、バージョン %1$s\n\
使い方: %2$s javasp <コマンド> [パラメーター]\n\
使い方: %2$s pl <コマンド> [パラメーター]\n\
\n\
正しいコマンド:\n\
start [データベース名]\n\
stop [データベース名]\n\
restart [データベース名]\n\
status [データベース名]\n
45 cubridユーティリティー、バージョン %1$s\n\
Expand Down
10 changes: 7 additions & 3 deletions contrib/msg/km_KH.utf8/cubrid.msg
Original file line number Diff line number Diff line change
Expand Up @@ -1445,8 +1445,9 @@ Check the path of the key file (_keys) and make sure that it includes proper key

1359 Java VM crashed: %1$s
1360 In line %1$d, column %2$d\nStored procedure compile error: %3$s

1361 Last Error
1361 Dropping system generated stored procedure is not allowed.
1362 PL/CSQL Stored procedure/function does not support Invoker's rights
1363 Last Error

$set 6 MSGCAT_SET_INTERNAL
1 Error in error subsystem (line %1$d):
Expand Down Expand Up @@ -1937,7 +1938,10 @@ $set 8 MSGCAT_SET_PARSER_SEMANTIC
320 Unsupported return type '%1$s' of the stored procedure
321 %TYPE type specification is allowed only for PL/CSQL
322 Table column '%1$s.%2$s' has not been defined
323 Stored procedure/function '%1$s' has OUT or IN OUT arguments
323 Stored procedure/function "%1$s" does not exist.
324 Attempting to assign DEFAULT on an Out parameter is not allowed: '%1$s'.
325 Only trailing default parameter is allowed: invalid at '%1$s'.
326 Stored procedure/function '%1$s' has OUT or IN OUT arguments

$set 9 MSGCAT_SET_PARSER_RUNTIME
1 Out of virtual memory: unable to allocate %1$d bytes.
Expand Down
6 changes: 2 additions & 4 deletions contrib/msg/km_KH.utf8/utils.msg
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Available service's utilities:\n\
gateway\n\
manager\n\
heartbeat\n\
javasp\n\
pl\n\
\n\
Available administrator's utilities:\n\
addvoldb\n\
Expand Down Expand Up @@ -262,11 +262,9 @@ Available command:\n\
42 Invalid argument.\n
43 File(%1$s) open error.\n
44 cubrid utility, version %1$s\n\
usage: %2$s javasp <command> [args]\n\
usage: %2$s pl <command> [args]\n\
\n\
Available command:\n\
start [database-name]\n\
stop [database-name]\n\
restart [database-name]\n\
status [database-name]\n
45 cubrid utility, version %1$s\n\
Expand Down
Loading

0 comments on commit 8c1d7a8

Please sign in to comment.