Skip to content

Commit 31148a8

Browse files
authored
Merge pull request #396 from FgForrest/dev
Regular patch fix bundle
2 parents 9c5fa1a + 3ad6867 commit 31148a8

File tree

65 files changed

+13736
-658
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+13736
-658
lines changed

documentation/publishing/root.cz/01-introduction/01-introduction.html

+2-10
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,8 @@ <h1>evitaDB – představení rychlé in-memory databáze pro e-commerce</h1>
3333
<time datetime="2024-01-01">1. ledna 2024</time>
3434
<p>
3535
Tento článek je prvním ze série článků, které se vám budou snažit přiblížit novou databázi
36-
<a href="https://evitadb.io">evitaDB</a> specializující se na práci s daty v katalogových řešení
37-
především v oblasti e-commerce, ale nejen tam. evitaDB se snaží zjednodušit implementaci všech scénářů,
38-
které vývojáři musí řešit při vývoji aplikací, které pracují s nabídkou položek organizovanou v
39-
hierarchických strukturách, facetovým a fulltextovým vyhledáváním, základní cenotvorbou a dalšími funkcemi,
40-
které jsou v produktových katalozích, e-shopech a dalších podobných aplikacích potřeba. Databáze si hravě
41-
poradí i s obsahovou částí takových aplikací - tj. články, blogy, recenzemi a dalšími prvky, které
42-
katalogová řešení doplňují. Všechny funkce jsou implementovány s ohledem na nízkou latenci a vysokou
43-
propustnost, které jsou v tomto segmentu aplikací klíčové. Pokud vás tento úvod zaujal, pokusíme se vás v
44-
dalších článcích přesvědčit o tom, že to nejsou jen prázdné marketingové fráze, ale fakta, která si můžete
45-
sami ověřit a třeba na této databázi zkusit postavit svou další aplikaci.
36+
evitaDB specializující se na práci s daty v katalogových řešení především v oblasti e-commerce, ale nejen
37+
tam.
4638
</p>
4739
</header>
4840
<article>

documentation/publishing/root.cz/02-write-data/02-write-data.html

+841-11
Large diffs are not rendered by default.

documentation/user/en/index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ in the separate part of this site.
3535
</NoteTitle>
3636

3737
evitaDB is currently in alpha version and a lot of development is going on right now. We plan to stabilize the first
38-
generally available version at the beginning of 2024. Until that time, the storage format may change at any time, which
38+
generally available version in 2024. Until that time, the storage format may change at any time, which
3939
will require all existing data to be dropped and re-indexed from the primary storage.
4040

4141
**Please do not use evitaDB to store your primary data for the reasons mentioned above.**
4242

43-
In the fall of 2023, we plan to release a beta version and deploy it first to our own customers to gain first-hand
43+
In the spring of 2023, we plan to release a beta version and deploy it first to our own customers to gain first-hand
4444
experience using it ourselves. When we can be sure that the database engine is stable and reliable, we will release
4545
the first version to the general public.
4646
</Note>

documentation/user/en/operate/run.md

+26-26
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ You can do both in one command using `docker run`. This is the easiest way to ru
2424

2525
```shell
2626
# Linux variant: run on foreground, destroy container after exit, use host ports without NAT
27-
docker run --name evitadb -i --rm --net=host \
27+
docker run --name evitadb -i --rm --net=host \
2828
index.docker.io/evitadb/evitadb:latest
2929

30-
# Windows / MacOS: there is open issue https://github.com/docker/roadmap/issues/238
30+
# Windows / MacOS: there is open issue https://github.com/docker/roadmap/issues/238
3131
# and you need to open ports manually and propagate host IP address to the container
3232
docker run --name evitadb -i --rm -p 5555:5555 -p 5556:5556 -p 5557:5557 \
33-
-e "api.exposedOn=localhost" \
33+
-e "api.exposedOn=localhost" \
3434
index.docker.io/evitadb/evitadb:latest
3535
```
3636

3737
When you start the evitaDB server you should see the following information in the console output:
3838

3939
```plain
40-
_ _ ____ ____
41-
_____ _(_) |_ __ _| _ \| __ )
42-
/ _ \ \ / / | __/ _` | | | | _ \
40+
_ _ ____ ____
41+
_____ _(_) |_ __ _| _ \| __ )
42+
/ _ \ \ / / | __/ _` | | | | _ \
4343
| __/\ V /| | || (_| | |_| | |_) |
44-
\___| \_/ |_|\__\__,_|____/|____/
44+
\___| \_/ |_|\__\__,_|____/|____/
4545
4646
You'll see some version here
4747
Visit us at: https://evitadb.io
@@ -79,8 +79,8 @@ API `system` listening on http://your-server:5557/system/
7979
<Tr>
8080
<Td>`-i`</Td>
8181
<Td>
82-
keeps STDIN open - the container will run in the foreground, and you'll see the container's
83-
standard/error output in the console. in the console, and you can stop the container by sending it
82+
keeps STDIN open - the container will run in the foreground, and you'll see the container's
83+
standard/error output in the console. in the console, and you can stop the container by sending it
8484
a terminal signal (usually the the key combination `Ctrl`+`C`, or `Command`+`.` on MacOS).
8585
</Td>
8686
</Tr>
@@ -94,9 +94,9 @@ API `system` listening on http://your-server:5557/system/
9494
<Tr>
9595
<Td>`--net=host`</Td>
9696
<Td>
97-
instructs Docker to use directly host system network stack, this way evitaDB behaves as if it runs directly
98-
on the host system network-wise, if the port configured in evitaDB configuration is already used on the
99-
system, Evita fails to set up appropriate web API (see next chapter for port remapping or
97+
instructs Docker to use directly host system network stack, this way evitaDB behaves as if it runs directly
98+
on the host system network-wise, if the port configured in evitaDB configuration is already used on the
99+
system, Evita fails to set up appropriate web API (see next chapter for port remapping or
100100
[evitaDB configuration](../operate/configure.md) for specifying open ports)
101101
</Td>
102102
</Tr>
@@ -112,17 +112,17 @@ open/re-mapping ports opened inside the Docker container in the following way:
112112
```shell
113113
# run on foreground, destroy container after exit, use exact mapping for host ports
114114
docker run --name evitadb -i --rm \
115-
-p 5555:5555 \
116-
-p 5556:5556 \
115+
-p 5555:5555 \
116+
-p 5556:5556 \
117117
-p 5557:5557 \
118-
-e "api.exposedOn=localhost" \
118+
-e "api.exposedOn=localhost" \
119119
index.docker.io/evitadb/evitadb:latest
120120
```
121121

122122
<Note type="info">
123123

124124
The `-e "api.exposedOn=localhost"` argument is necessary when evitaLab and/or Open API schema is generated and used
125-
from the host system the docker container is running on. This argument is not necessary when container shares
125+
from the host system the docker container is running on. This argument is not necessary when container shares
126126
the network with the host using argument `--net=host`. Argument tells evitaDB running in container to use `localhost`
127127
as a domain for generated URLs in the schemas and the evitaLab network requests. Otherwise it would use the container
128128
inner hostname as a domain, which is not accessible from the outer host system.
@@ -170,7 +170,7 @@ inner hostname as a domain, which is not accessible from the outer host system.
170170
<Tr>
171171
<Td>`-p`</Td>
172172
<Td>
173-
port remapping in the format `host port`:`container port`, so you could remap default ports opened by
173+
port remapping in the format `host port`:`container port`, so you could remap default ports opened by
174174
evitaDB inside the container to different ports on the host system.
175175
</Td>
176176
</Tr>
@@ -259,7 +259,7 @@ You can take advantage of all the following variables:
259259
</Tr>
260260
<Tr>
261261
<Td>**`EVITA_JAVA_OPTS`**</Td>
262-
<Td>Java commandline arguments
262+
<Td>Java commandline arguments
263263
(list of basic arguments [can be found here](https://docs.oracle.com/en/java/javase/17/docs/specs/man/java.html#overview-of-java-options)),
264264
default: none (empty string)</Td>
265265
</Tr>
@@ -292,18 +292,18 @@ You can also provide the entire configuration YAML file using a special volume i
292292
```shell
293293
## run interactively, destroy container after exit, use host ports without NAT, specify your own data directory and configuration file
294294
docker run --name evitadb -i --net=host \
295-
-v "__config_file__:/evita/conf/evita-configuration.yaml" \
295+
-v "__config_file__:/evita/conf/evita-configuration.yaml" \
296296
-v "__data_dir__:/evita/data" \
297297
-v "__certificate_dir__:/evita/certificates" \
298298
index.docker.io/evitadb/evitadb:latest
299299
```
300300

301-
You need to replace `__config_file__` with the path to the YAML file and `__data_dir__`, `__certificate_dir__` with
301+
You need to replace `__config_file__` with the path to the YAML file and `__data_dir__`, `__certificate_dir__` with
302302
existing folders on the host file system.
303303

304304
<Note type="info">
305-
The contents should match the default configuration file
306-
<SourceClass>docker/evita-configuration.yaml</SourceClass>, but you can specify constants instead
305+
The contents should match the default configuration file
306+
<SourceClass>docker/evita-configuration.yaml</SourceClass>, but you can specify constants instead
307307
of variables in certain settings.
308308
</Note>
309309

@@ -348,13 +348,13 @@ curl -k "https://localhost:5555/rest/system/liveness" \
348348
```
349349
this should return following confirmation about liveness status of the REST API:
350350
```json
351-
{"alive":true}
351+
{"liveness":true}
352352
```
353353

354354
### Control logging
355355

356356
evitaDB uses the [Slf4j](https://www.slf4j.org/) logging facade with [Logback](https://logback.qos.ch/) implementation, but
357-
you're free to change this. The default logback configuration is defined in a file
357+
you're free to change this. The default logback configuration is defined in a file
358358
<SourceClass>evita_server/src/main/resources/META-INF/logback.xml</SourceClass>.
359359

360360
You can completely override the default logback configuration by providing your own
@@ -363,7 +363,7 @@ You can completely override the default logback configuration by providing your
363363
```shell
364364
## run interactively, destroy container after exit, use host ports without NAT, specify your own data directory and configuration file
365365
docker run --name evitadb -i --net=host \
366-
-v "__config_file__:/evita/conf/evita-configuration.yaml" \
366+
-v "__config_file__:/evita/conf/evita-configuration.yaml" \
367367
-v "__data_dir__:/evita/data" \
368368
-v "__certificate_dir__:/evita/certificates" \
369369
-v "__path_to_log_file__:/evita/logback.xml" \
@@ -401,7 +401,7 @@ evitaDB in the Docker compose file. The basic configuration could look like this
401401
version: "3.7"
402402
services:
403403
evita:
404-
image: index.docker.io/evitadb/evitadb:latest
404+
image: index.docker.io/evitadb/evitadb:latest
405405
environment:
406406
- EVITA_JAVA_OPTS=-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=*:5000
407407
volumes:

documentation/user/en/query/filtering/examples/comparable/attribute-between.rest.json.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"attributes": {
1313
"global": {
14-
"battery-capacity": "125.00000",
14+
"batteryCapacity": "125.00000",
1515
"code": "amazfit-band-5"
1616
}
1717
}
@@ -25,7 +25,7 @@
2525
],
2626
"attributes": {
2727
"global": {
28-
"battery-capacity": "160.00000",
28+
"batteryCapacity": "160.00000",
2929
"code": "amazfit-neo"
3030
}
3131
}
@@ -39,7 +39,7 @@
3939
],
4040
"attributes": {
4141
"global": {
42-
"battery-capacity": "148.00000",
42+
"batteryCapacity": "148.00000",
4343
"code": "fitbit-inspire-2"
4444
}
4545
}

documentation/user/en/query/filtering/examples/comparable/attribute-greater-than-equals.rest.json.md

+7-7
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"attributes": {
1313
"global": {
14-
"battery-life": "40.00000",
14+
"batteryLife": "40.00000",
1515
"code": "amazfit-bip-s"
1616
}
1717
}
@@ -25,7 +25,7 @@
2525
],
2626
"attributes": {
2727
"global": {
28-
"battery-life": "40.00000",
28+
"batteryLife": "40.00000",
2929
"code": "amazfit-bip-s-1"
3030
}
3131
}
@@ -39,7 +39,7 @@
3939
],
4040
"attributes": {
4141
"global": {
42-
"battery-life": "40.00000",
42+
"batteryLife": "40.00000",
4343
"code": "amazfit-bip-s-2"
4444
}
4545
}
@@ -53,7 +53,7 @@
5353
],
5454
"attributes": {
5555
"global": {
56-
"battery-life": "40.00000",
56+
"batteryLife": "40.00000",
5757
"code": "amazfit-bip-s-3"
5858
}
5959
}
@@ -67,7 +67,7 @@
6767
],
6868
"attributes": {
6969
"global": {
70-
"battery-life": "40.00000",
70+
"batteryLife": "40.00000",
7171
"code": "amazfit-bip-s-4"
7272
}
7373
}
@@ -81,7 +81,7 @@
8181
],
8282
"attributes": {
8383
"global": {
84-
"battery-life": "45.00000",
84+
"batteryLife": "45.00000",
8585
"code": "amazfit-bip"
8686
}
8787
}
@@ -95,7 +95,7 @@
9595
],
9696
"attributes": {
9797
"global": {
98-
"battery-life": "365.00000",
98+
"batteryLife": "365.00000",
9999
"code": "garmin-vivofit-jr-3"
100100
}
101101
}

documentation/user/en/query/filtering/examples/comparable/attribute-greater-than.rest.json.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"attributes": {
1313
"global": {
14-
"battery-life": "45.00000",
14+
"batteryLife": "45.00000",
1515
"code": "amazfit-bip"
1616
}
1717
}
@@ -25,7 +25,7 @@
2525
],
2626
"attributes": {
2727
"global": {
28-
"battery-life": "365.00000",
28+
"batteryLife": "365.00000",
2929
"code": "garmin-vivofit-jr-3"
3030
}
3131
}

documentation/user/en/query/filtering/examples/comparable/attribute-less-than-equals.rest.json.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"attributes": {
1313
"global": {
14-
"battery-capacity": "120.00000",
14+
"batteryCapacity": "120.00000",
1515
"code": "huawei-talkband-b6"
1616
}
1717
}
@@ -25,7 +25,7 @@
2525
],
2626
"attributes": {
2727
"global": {
28-
"battery-capacity": "120.00000",
28+
"batteryCapacity": "120.00000",
2929
"code": "huawei-watch-3"
3030
}
3131
}
@@ -39,7 +39,7 @@
3939
],
4040
"attributes": {
4141
"global": {
42-
"battery-capacity": "125.00000",
42+
"batteryCapacity": "125.00000",
4343
"code": "amazfit-band-5"
4444
}
4545
}

documentation/user/en/query/filtering/examples/comparable/attribute-less-than.rest.json.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
],
1212
"attributes": {
1313
"global": {
14-
"battery-capacity": "120.00000",
14+
"batteryCapacity": "120.00000",
1515
"code": "huawei-talkband-b6"
1616
}
1717
}
@@ -25,7 +25,7 @@
2525
],
2626
"attributes": {
2727
"global": {
28-
"battery-capacity": "120.00000",
28+
"batteryCapacity": "120.00000",
2929
"code": "huawei-watch-3"
3030
}
3131
}

0 commit comments

Comments
 (0)