Skip to content

Commit 565a8f9

Browse files
markddrakemarkddrake
committed
Release v24.10: Minor Fixes
Fix #260 Fix #259 Fix #258 OracleDBI: Add support for identifying Oracle Bug 37225191 OracleDBI: Suppress XMLTYPE column storage clause generation when Oracle generates it correctly OracleDBI: Improve LOB Fetch operations LoaderDBI: Improve Encryption Support FileDBI:Improve Encryption Support YadamuCLI: Replace copy with pump OracleQA: Strip Carriage Returns from sample XML Files
1 parent 0d8a77f commit 565a8f9

28 files changed

+496
-273
lines changed

‎bin/copy.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
@echo off
22
REM Run from YADAMU_HOME
33
if not defined YADAMU_HOME set YADAMU_HOME=%CD%
4-
node %YADAMU_HOME%\src\node\cli\copy.js %*
4+
node %YADAMU_HOME%\src\node\cli\pump.js %*

‎docker/bin/runStandaloneTests.bat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ docker compose --file docker\dockerfiles\linux\COCKROACH-01.yml down -v
5252
docker compose --file docker\dockerfiles\linux\YUGABYTE-01.yml up -d
5353
echo 'Waiting for Yugabyte Startup'
5454
timeout /nobreak /t 60
55-
start "Yugabyte Configuration" /MIN /WAIT /D C:\DEVELOPMENT\YADAMU CMD /c docker\rdbms\configuration\linux\configureYugabyte yb-tserver-n1
55+
start "Yugabyte Configuration" /MIN /WAIT /D C:\DEVELOPMENT\YADAMU CMD /c docker\rdbms\configuration\linux\configureYugabyte YUGABYTE-01
5656
start "Yugabyte Test Suite" /MIN /WAIT /D C:\DEVELOPMENT\YADAMU CMD /c docker\bin\runTestSuite ydb > ydb.log
5757
echo 'Waiting for Yugabyte Test Suite to complete.'
5858
docker wait YADAMU-01

‎docker/dockerfiles/linux/ORA2305-01.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ services:
33

44
ORA2305-01:
55
container_name: ORA2305-01
6-
image: container-registry.oracle.com/database/free:latest
7-
#image: gvenzl/oracle-free:23.5-full
6+
#image: container-registry.oracle.com/database/free:latest
7+
image: gvenzl/oracle-free:23.5-full
88
mem_limit: '16gb'
99
security_opt:
1010
- seccomp:unconfined
@@ -13,7 +13,7 @@ services:
1313
networks:
1414
- YADAMU-NET
1515
ports:
16-
- "1521:1521"
16+
- "15218:1521"
1717
environment:
1818
ORACLE_SID: FREE
1919
ORACLE_PDB: FREEPDB1

‎docker/dockerfiles/linux/TERADATA-17.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,9 @@ services:
1616
volumes:
1717
- YADAMU_01-SHARED:/mnt/shared
1818
- TDATA17-01-APPLIANCE:/root/VBox
19-
- /tmp/.X11-unix:/tmp/.X11-unix
20-
19+
- /tmp/.X11-unix:/tmp/.X11-unix
2120
devices:
22-
- "/dev/vboxdrv:/dev/vboxdrv"
23-
21+
- /dev/vboxdrv:/dev/vboxdrv
2422
restart: always
2523

2624
volumes:

‎docker/dockerfiles/linux/YUGABYTE-01.V1.yml‎

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
version: '2'
2+
3+
volumes:
4+
yb-master-data-1:
5+
yb-tserver-data-1:
6+
YADAMU_01-SHARED:
7+
name: YADAMU_01-SHARED
8+
9+
services:
10+
yb-master:
11+
# image: yugabytedb/yugabyte:latest
12+
image: yugabytedb/yugabyte:2.18.6.0-b73-x86_64
13+
container_name: yb-master-n1
14+
mem_limit: '4Gb'
15+
volumes:
16+
- yb-master-data-1:/mnt/master
17+
- YADAMU_01-SHARED:/mnt/shared
18+
command: [ "/home/yugabyte/bin/yb-master",
19+
"--fs_data_dirs=/mnt/master",
20+
"--master_addresses=yb-master-n1:7100",
21+
"--rpc_bind_addresses=yb-master-n1:7100",
22+
"--replication_factor=1"]
23+
#, "--memory_limit_hard_bytes 34359738368"
24+
networks:
25+
- YADAMU-NET
26+
ports:
27+
- "7000:7000"
28+
environment:
29+
SERVICE_7000_NAME: yb-master
30+
31+
yb-tserver:
32+
# image: yugabytedb/yugabyte:latest
33+
image: yugabytedb/yugabyte:2.18.6.0-b73-x86_64
34+
container_name: yb-tserver-n1
35+
mem_limit: '16gb'
36+
volumes:
37+
- yb-tserver-data-1:/mnt/tserver
38+
- YADAMU_01-SHARED:/mnt/shared
39+
command: [ "/home/yugabyte/bin/yb-tserver",
40+
"--fs_data_dirs=/mnt/tserver",
41+
"--start_pgsql_proxy",
42+
"--rpc_bind_addresses=yb-tserver-n1:9100",
43+
"--tserver_master_addrs=yb-master-n1:7100",
44+
"--memory_limit_hard_bytes=15032385536"]
45+
networks:
46+
- YADAMU-NET
47+
ports:
48+
- "9042:9042"
49+
- "5533:5433"
50+
- "9500:9000"
51+
environment:
52+
SERVICE_5433_NAME: ysql
53+
SERVICE_9042_NAME: ycql
54+
SERVICE_6379_NAME: yedis
55+
SERVICE_9500_NAME: yb-tserver
56+
depends_on:
57+
- yb-master
58+
59+
networks:
60+
YADAMU-NET:
61+
name: YADAMU-NET

‎docker/dockerfiles/linux/YUGABYTE-01.yml‎

Lines changed: 19 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,30 @@
1-
version: '2'
2-
3-
volumes:
4-
yb-master-data-1:
5-
yb-tserver-data-1:
6-
YADAMU_01-SHARED:
7-
name: YADAMU_01-SHARED
1+
version: "2.4"
82

93
services:
10-
yb-master:
11-
image: yugabytedb/yugabyte:latest
12-
container_name: yb-master-n1
13-
mem_limit: '4Gb'
14-
volumes:
15-
- yb-master-data-1:/mnt/master
16-
- YADAMU_01-SHARED:/mnt/shared
17-
command: [ "/home/yugabyte/bin/yb-master",
18-
"--fs_data_dirs=/mnt/master",
19-
"--master_addresses=yb-master-n1:7100",
20-
"--rpc_bind_addresses=yb-master-n1:7100",
21-
"--replication_factor=1"]
22-
#, "--memory_limit_hard_bytes 34359738368"
23-
networks:
24-
- YADAMU-NET
25-
ports:
26-
- "7000:7000"
27-
environment:
28-
SERVICE_7000_NAME: yb-master
29-
30-
yb-tserver:
31-
image: yugabytedb/yugabyte:latest
32-
container_name: yb-tserver-n1
33-
mem_limit: '16gb'
4+
YUGABYTE-01:
5+
container_name: YUGABYTE-01
6+
# image: yugabytedb/yugabyte:latest
7+
image: yugabytedb/yugabyte:2024.1.3.0-b105
8+
command: /home/yugabyte/bin/yugabyted start --background=false --base_dir=/home/yugabyte/yb_data
9+
# command: sleep 365d
10+
mem_limit: '16Gb'
3411
volumes:
35-
- yb-tserver-data-1:/mnt/tserver
12+
- YUGABYTE_01-DATA:/home/yugabyte/yb_data
3613
- YADAMU_01-SHARED:/mnt/shared
37-
command: [ "/home/yugabyte/bin/yb-tserver",
38-
"--fs_data_dirs=/mnt/tserver",
39-
"--start_pgsql_proxy",
40-
"--rpc_bind_addresses=yb-tserver-n1:9100",
41-
"--tserver_master_addrs=yb-master-n1:7100",
42-
"--memory_limit_hard_bytes=15032385536"]
4314
networks:
4415
- YADAMU-NET
4516
ports:
46-
- "9042:9042"
47-
- "5533:5433"
48-
- "9500:9000"
49-
environment:
50-
SERVICE_5433_NAME: ysql
51-
SERVICE_9042_NAME: ycql
52-
SERVICE_6379_NAME: yedis
53-
SERVICE_9500_NAME: yb-tserver
54-
depends_on:
55-
- yb-master
17+
- "7000:7000"
18+
- "9010:9000"
19+
- "15433:15433"
20+
- "5533:5433"
21+
- "9042:9042"
5622

5723
networks:
5824
YADAMU-NET:
5925
name: YADAMU-NET
26+
27+
volumes:
28+
YADAMU_01-SHARED:
29+
name: YADAMU_01-SHARED
30+
YUGABYTE_01-DATA:

‎docker/dockerfiles/linux/docker-compose.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,8 @@ services:
136136
restart: always
137137

138138
# ORA2103-01: 15216
139+
# ORA2303-01: 15217
140+
# ORA2305-01: 15218
139141

140142
MARIA11-01:
141143
container_name: MARIA11-01

‎docker/rdbms/configuration/linux/configureOracle.bat‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ docker cp docker/rdbms/oracle/setup %CONTAINER_NAME%:/opt/oracle/or
44
docker cp src/sql/oracle/ %CONTAINER_NAME%:/opt/oracle/oradata/stage
55
docker exec -it %CONTAINER_NAME% mv /opt/oracle/oradata/stage/oracle /opt/oracle/oradata/stage/sql
66
docker cp docker/rdbms/oracle/testdata %CONTAINER_NAME%:/opt/oracle/oradata/stage
7+
docker exec -it -u root -w /opt/oracle/oradata %CONTAINER_NAME% bash -c "command -v microdnf && microdnf install -y dos2unix findutils"
78
docker exec -it -u root -w /opt/oracle/oradata %CONTAINER_NAME% chown -R oracle:oinstall stage
89
docker exec -it -u root -w /opt/oracle/oradata %CONTAINER_NAME% chmod -R u+rwx stage
910
docker exec -it %CONTAINER_NAME% /bin/bash /opt/oracle/oradata/stage/setup/configure.sh

‎docker/rdbms/oracle/setup/installSampleSchemas.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
cd $STAGE
22
unzip testdata/sampleSchemas.zip
33
cd sampleSchemas
4+
command -v dos2unix && find order_entry/2002/ -type f -exec dos2unix {} +
45
exit | sqlplus /nolog @mksample oracle oracle oracle oracle oracle oracle oracle oracle USERS TEMP log/ localhost:1521/$ORACLE_PDB

‎docker/rdbms/teradata/docker/linux/17/Dockerfile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
FROM ubuntu:20.04
1+
FROM ubuntu:24.04
22
RUN apt-get update \
3-
&& apt-get -y install wget gnupg2 software-properties-common net-tools iputils-ping ssh sshpass
4-
# && wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | apt-key add - \
5-
# && wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | apt-key add - \
6-
# && add-apt-repository "deb https://download.virtualbox.org/virtualbox/debian focal contrib"
7-
#RUN apt-get -y install virtualbox-6.1
3+
&& apt-get -y install wget gnupg2 software-properties-common net-tools iputils-ping ssh sshpass apt-utils \
4+
&& wget -q https://www.virtualbox.org/download/oracle_vbox_2016.asc -O- | apt-key add - \
5+
&& wget -q https://www.virtualbox.org/download/oracle_vbox.asc -O- | apt-key add - \
6+
&& add-apt-repository "deb https://download.virtualbox.org/virtualbox/debian noble contrib" \
7+
&& apt-get -y install virtualbox \
8+
&& apt-get -y install virtualbox-ext-pack <<EOF
9+
Y
10+
EOF
11+
RUN apt-get --reinstall install virtualbox-dkms
812
WORKDIR /root
9-
RUN wget https://download.virtualbox.org/virtualbox/6.1.34/virtualbox-6.1_6.1.34-150636~Ubuntu~eoan_amd64.deb -O virtualbox-6.1_6.1.34-150636~Ubuntu~eoan_amd64.deb \
10-
&& wget https://download.virtualbox.org/virtualbox/6.1.34/Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack -O Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack \
11-
&& apt -y install ./virtualbox-6.1_6.1.34-150636~Ubuntu~eoan_amd64.deb
1213
COPY Teradata_Database_17.10.02.01_SLES12_SP3_on_VMware_20210603130901.ova .
13-
# COPY Oracle_VM_VirtualBox_Extension_Pack-6.1.34.vbox-extpack .
1414
COPY createTDVM.sh .
1515
copy exec_tdvm_init.sh .
1616
#CMD virtualbox

0 commit comments

Comments
 (0)