Skip to content

Commit

Permalink
[r2.00] Prepare for YottaDB r2.00 release
Browse files Browse the repository at this point in the history
* This commit updates various files in anticipation of the upcoming r2.00 release.
  See 5f6623f for similar changes at the time of `r1.38` release.
  • Loading branch information
nars1 committed Feb 19, 2024
1 parent b01270b commit d87c914
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 46 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2012-2020 Fidelity National Information #
# Services, Inc. and/or its subsidiaries. All rights reserved. #
# #
# Copyright (c) 2017-2023 YottaDB LLC and/or its subsidiaries. #
# Copyright (c) 2017-2024 YottaDB LLC and/or its subsidiaries. #
# All rights reserved. #
# #
# Copyright (c) 2017 Stephen L Johnson. All rights reserved. #
Expand Down Expand Up @@ -33,7 +33,7 @@ foreach(lang ${languages})
endforeach()

# Defaults
set(version r139)
set(version r200)
# If CMAKE_BUILD_TYPE is not defined make it a Release build
if(NOT CMAKE_CONFIGURATION_TYPES AND NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE "RelWithDebInfo" CACHE STRING "Build type" FORCE)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ listed below. For example for Ubuntu Linux:
- Installing YottaDB

Now you are ready to install YottaDB. The default installation path for each release includes the release
(e.g. for YottaDB r1.38, the default installation path is /usr/local/lib/yottadb/r138),
(e.g. for YottaDB r2.00, the default installation path is /usr/local/lib/yottadb/r200),
but can be controlled using the ```--installdir``` option. Run ```./ydbinstall --help``` for a list of options.

Note that if the ```ydb_icu_version``` env var is set to a value other than what `pkg-config --modversion icu-io`
Expand Down
4 changes: 2 additions & 2 deletions sr_linux/release_name.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) 2001-2018 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2017-2023 YottaDB LLC and/or its subsidiaries. *
* Copyright (c) 2017-2024 YottaDB LLC and/or its subsidiaries. *
* All rights reserved. *
* *
* Copyright (c) 2017-2018 Stephen L Johnson. *
Expand All @@ -20,7 +20,7 @@

#define GTM_VERSION "V7.0"
#define GTM_ZVERSION "V7.0-001"
#define YDB_ZYRELEASE "r1.39" /* changes here should be reflected in YDB_RELEASE in sr_unix/libyottadb.h */
#define YDB_ZYRELEASE "r2.00" /* changes here should be reflected in YDB_RELEASE in sr_unix/libyottadb.h */

/* This sets YDB_RELEASE_STAMP as part of the cmake build process.
* Example values are
Expand Down
6 changes: 3 additions & 3 deletions sr_port/dse.hlp
Original file line number Diff line number Diff line change
Expand Up @@ -1558,9 +1558,9 @@

This command displays an output like the following:

File /home/jdoe/.yottadb/r1.38_x86_64/g/yottadb.dat
File /home/jdoe/.yottadb/r2.00_x86_64/g/yottadb.dat
Region DEFAULT
File /home/jdoe/.yottadb/r1.38_x86_64/g/yottadb.dat
File /home/jdoe/.yottadb/r2.00_x86_64/g/yottadb.dat
Region DEFAULT
Date/Time 27-JAN-2019 03:13:40 [$H = 63214,11620]
Access method MM Global Buffers 1024
Expand Down Expand Up @@ -2968,6 +2968,6 @@

**Note**

This help file is a concise representation of the revision r1.38 of the
This help file is a concise representation of the revision r2.00 of the
Administration and Operations Guide. To obtain a copy of the current
revision, go to https://docs.yottadb.com/AdminOpsGuide/index.html.
2 changes: 1 addition & 1 deletion sr_port/lke.hlp
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,6 @@

**Note**

This help file is a concise representation of the revision r1.38 of the
This help file is a concise representation of the revision r2.00 of the
Administration and Operations Guide. To obtain a copy of the current
revision, go to https://docs.yottadb.com/AdminOpsGuide/index.html.
42 changes: 21 additions & 21 deletions sr_port/mumps.hlp
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@

**Note**

This help file is a concise representation of the revision r1.38 of the
This help file is a concise representation of the revision r2.00 of the
Administration and Operations Guide. To obtain a copy of the current
revision, go to https://docs.yottadb.com/ProgrammersGuide/index.html.

Expand Down Expand Up @@ -537,7 +537,7 @@

Example:

$ /usr/local/lib/yottadb/r138/ydb -run ^killalias
$ /usr/local/lib/yottadb/r200/ydb -run ^killalias
killalias ; Demonstrate Kill * of pass-by-reference
ZPrint ; Print this program
Set A=1,C=3
Expand Down Expand Up @@ -598,7 +598,7 @@

Example:

$ /usr/local/lib/yottadb/r138/ydb -run ^tprestart
$ /usr/local/lib/yottadb/r200/ydb -run ^tprestart
tprestart ; Transaction restart variable association also restored on restart
zprint ; Print this program
set A="Malvern",C="Pennsylvania",E="USA"
Expand Down Expand Up @@ -653,7 +653,7 @@

Note that TROLLBACK does not restore alias variables:

/usr/local/lib/yottadb/r138/ydb -run ^tprollback
/usr/local/lib/yottadb/r200/ydb -run ^tprollback
tprollback ;
zprint ; Print this program
set A(1)=1,A(2)=2,A(3)=3
Expand Down Expand Up @@ -715,7 +715,7 @@

Example:

$ /usr/local/lib/yottadb/r138/ydb -run ^aliasexample; Extended annotated alias example
$ /usr/local/lib/yottadb/r200/ydb -run ^aliasexample; Extended annotated alias example
zprint
write "------------",!
set x="name level",x(1)=1,x(1,2)="1,2",x("foo")="bar"
Expand Down Expand Up @@ -1887,7 +1887,7 @@
Example:

YDB>write $zgbldir
/usr/local/lib/yottadb/r138/mumps.gld
/usr/local/lib/yottadb/r200/mumps.gld
YDB>set $zgbldir="test.gld"
YDB>set a=10
YDB>set b=a
Expand Down Expand Up @@ -4552,7 +4552,7 @@

Example:

/usr/local/lib/yottadb/r138/ydb -run ^stackalias
/usr/local/lib/yottadb/r200/ydb -run ^stackalias
stackalias ; Demonstrate New with alias
ZPrint ; Print this program
Set A=1,*B=A,*C(2)=A ; Create some aliases
Expand Down Expand Up @@ -4597,7 +4597,7 @@
The following is essentially the same as the prior example but using an
exclusive NEW:

$ /usr/local/lib/yottadb/r138/ydb -run ^stackalias1
$ /usr/local/lib/yottadb/r200/ydb -run ^stackalias1
stackalias1 ; Demonstrate New with alias
ZPrint ; Print this program
Set A=1,*B=A,*C(2)=A ; Create some aliases
Expand Down Expand Up @@ -5915,7 +5915,7 @@
YDB>ZLink "NOSENSE"
%YDB-E-LABELMISSING Label referenced but
not defined:lab
%YDB-I-SRCNAM in source module /home/gtmuser1/.yottadb/r138_x86_64/r/
%YDB-I-SRCNAM in source module /home/gtmuser1/.yottadb/r200_x86_64/r/
NOSENSE.m
YDB>ZPrint ^NOSENSE
NOSENSE;
Expand Down Expand Up @@ -6932,7 +6932,7 @@
TR0:0,TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0,ZTR:0,DFL:0,DFS:0,JFL:0,JFS:0,JBB:0,JFB:0,JFW:0,JRL:0,JRP:0,
JRE:0,JRI:0,JRO:0,JEX:0,DEX:0,CAT:4,CFE:0,CFS:0,CFT:0,CQS:0,CQT:0,CYS:0,CYT:0,BTD:0,WFR:0,BUS:0,BTS:0,
DEXA:0,GLB:0,JNL:0,MLK:0,PRC:0,TRX:0,ZAD:0,JOPA:0,AFRA:0,BREA:0,MLBA:0,TRGA:0
GLD:/home/gtmuser1/.yottadb/r138_x86_64/g/mumps.gld,REG:DEFAULT,SET:205,KIL:0,GET:1,
GLD:/home/gtmuser1/.yottadb/r200_x86_64/g/mumps.gld,REG:DEFAULT,SET:205,KIL:0,GET:1,
DTA:0,ORD:0,ZPR:0,QRY:0,LKS:0,LKF:0,CTN:411,DRD:9,DWT:15,NTW:2
03,NTR:4,NBW:212,NBR:414,NR0:0,NR1:0,NR2:0,NR3:0,TTW:1,TTR:0,TRB:0,TBW:2,TBR:6,TR0:0,
TR1:0,TR2:0,TR3:0,TR4:0,TC0:0,TC1:0,TC2:0,TC3:0,TC4:0
Expand Down Expand Up @@ -7074,7 +7074,7 @@
$ZQUIT=0
$ZREALSTOR=694280
$ZRELDATE="20200731 20:46 6996f60301958081b568fb2a804695d700f51c5e (dirty)"
$ZROUTINES=". /home/user/.yottadb/r1.38_x86_64/o*(/home/user/.yottadb/r1.38_x86_64/r /home/user/.yottadb/r) /usr/local/lib/yottadb/r138/libyottadbutil.so"
$ZROUTINES=". /home/user/.yottadb/r2.00_x86_64/o*(/home/user/.yottadb/r2.00_x86_64/r /home/user/.yottadb/r) /usr/local/lib/yottadb/r200/libyottadbutil.so"
$ZSOURCE=""
$ZSTATUS=""
$ZSTEP="B"
Expand All @@ -7097,7 +7097,7 @@
$ZUT=1528962650791332
$ZVERSION="GT.M V6.3-014 Linux x86_64"
$ZYERROR=""
$ZYRELEASE="YottaDB r1.38 Linux x86_64"
$ZYRELEASE="YottaDB r2.00 Linux x86_64"

This example displays the current value of all intrinsic special
variables.
Expand Down Expand Up @@ -8598,7 +8598,7 @@

Example:

/usr/local/lib/yottadb/r138/ydb -run ^dstackex
/usr/local/lib/yottadb/r200/ydb -run ^dstackex
dstackex;
zprint ^dstackex
write !,$STACK
Expand Down Expand Up @@ -9206,7 +9206,7 @@
variable with an agreed prefix (e.g., "%") and its $ZAHANDLE() as a
suffix. The handle can be returned as the value.

$ /usr/local/lib/yottadb/r138/ydb -run retval
$ /usr/local/lib/yottadb/r200/ydb -run retval
retval ; Return an array / object from a function
;;Data for the object array
;;Albert Einstein,14-March-1879
Expand Down Expand Up @@ -10095,10 +10095,10 @@

YDB>set x=$zjobexam()
YDB>write x
/home/gtmuser1/.yottadb/r138_x86_64/r/YDB_JOBEXAM.ZSHOW_DMP_28760_1
/home/gtmuser1/.yottadb/r200_x86_64/r/YDB_JOBEXAM.ZSHOW_DMP_28760_1
YDB>set x=$zjobexam("test.file")
YDB>write x
/home/gtmuser1/.yottadb/r138_x86_64/r/test.file
/home/gtmuser1/.yottadb/r200_x86_64/r/test.file
YDB>

Shows default file name and type of the files created containing the zshow
Expand Down Expand Up @@ -10310,7 +10310,7 @@
Example:

$ cd /usr/work/me
$ /usr/local/lib/yottadb/r138/ydb
$ /usr/local/lib/yottadb/r200/ydb
YDB>For i="DIRECTORY","NAME","TYPE","" Write $ZPARSE("test.m",i),!
/usr/work/me/
test
Expand Down Expand Up @@ -10975,9 +10975,9 @@
Example:

YDB>write $ztrnlnm("ydb_dist")
/usr/local/lib/yottadb/r138/utf8
/usr/local/lib/yottadb/r200/utf8
YDB>write $ztrnlnm("ydb_dist","","","","","VALUE")
/usr/local/lib/yottadb/r138/utf8
/usr/local/lib/yottadb/r200/utf8
YDB>

This uses $ZTRNLNM() to display the translation value for ydb_dist.
Expand Down Expand Up @@ -11717,7 +11717,7 @@
Example:

$ export ydb_chset=UTF-8
$ /usr/local/lib/yottadb/r138/ydb
$ /usr/local/lib/yottadb/r200/ydb
YDB>write $zchset
UTF-8
YDB>
Expand Down Expand Up @@ -13221,7 +13221,7 @@
Example:

$ export sigusrval=10
$ /usr/local/lib/yottadb/r138/ydb
$ /usr/local/lib/yottadb/r200/ydb
YDB>zprint ^ztran
foo;
set $ztexit=1
Expand Down
16 changes: 8 additions & 8 deletions sr_port/mupip.hlp
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@
processing for all regions before starting archive. For example, a
message like:

DB file /home/jdoe/.yottadb/r138_x86_64/g/gtm.dat backed up in file /backup/gtm.dat
DB file /home/jdoe/.yottadb/r200_x86_64/g/gtm.dat backed up in file /backup/gtm.dat
Transactions up to 0x0000000000E92E04 are backed up.

confirms that gtm.dat is backed up correctly and is ready for archive.
Expand Down Expand Up @@ -2427,7 +2427,7 @@

$ mupip rctldump .
Object Directory : /tmp
Relinkctl filename : /tmp/yottadb/r138_x86_64/ydb-relinkctl-61f9eb418212a24a75327f53106c1656
Relinkctl filename : /tmp/yottadb/r200_x86_64/ydb-relinkctl-61f9eb418212a24a75327f53106c1656
# of routines : 1
# of attached processes : 2
Relinkctl shared memory : shmid: 11534344 shmlen: 0x57c6000
Expand Down Expand Up @@ -5551,12 +5551,12 @@
following is an example of SHOW=HEADER output:

-------------------------------------------------------------------------------
SHOW output for journal file /home/jdoe/.yottadb/r138_x86_64/g/gtm.mjl
SHOW output for journal file /home/jdoe/.yottadb/r200_x86_64/g/gtm.mjl
-------------------------------------------------------------------------------
Journal file name /home/jdoe/.yottadb/r138_x86_64/g/gtm.mjl
Journal file name /home/jdoe/.yottadb/r200_x86_64/g/gtm.mjl
Journal file label GDSJNL27
Database file name /home/jdoe/.yottadb/r138_x86_64/g/gtm.dat
Prev journal file name /home/jdoe/.yottadb/r138_x86_64/g/gtm.mjl_2012310190106
Database file name /home/jdoe/.yottadb/r200_x86_64/g/gtm.dat
Prev journal file name /home/jdoe/.yottadb/r200_x86_64/g/gtm.mjl_2012310190106
Next journal file name
Before-image journal ENABLED
Journal file header size 65536 [0x00010000]
Expand Down Expand Up @@ -5606,7 +5606,7 @@
qualifiers.The following is an example of SHOW=STATISTICS output:

-------------------------------------------------------------------------------
SHOW output for journal file /home/jdoe/.yottadb/r138_x86_64/g/gtm.mjl
SHOW output for journal file /home/jdoe/.yottadb/r200_x86_64/g/gtm.mjl
-------------------------------------------------------------------------------
Record type Count
----------------------
Expand Down Expand Up @@ -9265,6 +9265,6 @@ Example:

**Note**

This help file is a concise representation of the revision r1.38 of the
This help file is a concise representation of the revision r2.00 of the
Administration and Operations Guide. To obtain a copy of the current
revision, go to https://docs.yottadb.com/AdminOpsGuide/index.html.
4 changes: 2 additions & 2 deletions sr_unix/libyottadb.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Copyright (c) 2001-2017 Fidelity National Information *
* Services, Inc. and/or its subsidiaries. All rights reserved. *
* *
* Copyright (c) 2017-2023 YottaDB LLC and/or its subsidiaries. *
* Copyright (c) 2017-2024 YottaDB LLC and/or its subsidiaries. *
* All rights reserved. *
* *
* This source code contains the intellectual property *
Expand Down Expand Up @@ -67,7 +67,7 @@ enum
YDB_MAIN_LANG_GO = 1 /* Main routine is written in Go so handle signals differently */
};

#define YDB_RELEASE 139 /* Corresponds to YottaDB release r1.39 (i.e. YDB_ZYRELEASE in sr_linux/release_name.h) */
#define YDB_RELEASE 200 /* Corresponds to YottaDB release r2.00 (i.e. YDB_ZYRELEASE in sr_linux/release_name.h) */

/* Maximum values */
#define YDB_MAX_IDENT 31 /* Maximum size of global/local name (not including '^') */
Expand Down
12 changes: 6 additions & 6 deletions sr_unix/ydbinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Copyright (c) 2014-2021 Fidelity National Information #
# Services, Inc. and/or its subsidiaries. All rights reserved. #
# #
# Copyright (c) 2017-2023 YottaDB LLC and/or its subsidiaries. #
# Copyright (c) 2017-2024 YottaDB LLC and/or its subsidiaries. #
# All rights reserved. #
# #
# Copyright (c) 2018 Stephen L Johnson. #
Expand Down Expand Up @@ -223,11 +223,11 @@ help_exit()
echo "Version is defaulted from yottadb file if one exists in the same directory as the installer."
echo "This version must run as root."
echo ""
echo "Example usages are (assumes latest YottaDB release is r1.38 and latest GT.M version is V7.0-005)"
echo " $0 # installs latest YottaDB release (r1.38) at /usr/local/lib/yottadb/r138"
echo " $0 --utf8 # installs YottaDB release r1.38 with added support for UTF-8"
echo " $0 --installdir /r138 r1.38 # installs YottaDB r1.38 at /r138"
echo " $0 --gtm # installs latest GT.M version (V7.0-005) at /usr/local/lib/fis-gtm/V7.0-005_x86_64"
echo "Example usages are (assumes latest YottaDB release is r2.00 and latest GT.M version is V7.1-003)"
echo " $0 # installs latest YottaDB release (r2.00) at /usr/local/lib/yottadb/r200"
echo " $0 --utf8 # installs YottaDB release r2.00 with added support for UTF-8"
echo " $0 --installdir /r200 r2.00 # installs YottaDB r2.00 at /r200"
echo " $0 --gtm # installs latest GT.M version (V7.1-003) at /usr/local/lib/fis-gtm/V7.1-003_x86_64"
echo ""
echo "As options are processed left to right, later options can override earlier options."
echo ""
Expand Down

0 comments on commit d87c914

Please sign in to comment.