Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(DO NOT MERGE) ES changes for testnet #2569

Closed
wants to merge 48 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
d623471
Fix for ES7
oxarbitrage Sep 20, 2019
ae067f0
change major version check
oxarbitrage Sep 20, 2019
9c443bd
Update SonarScanner config for develop branch
abitmore Dec 12, 2021
17422e4
Merge pull request #2550 from bitshares/release_to_develop
abitmore Dec 12, 2021
dd244e7
Merge pull request #2560 from bitshares/release
abitmore Dec 16, 2021
9d99fce
Move some code from hpp file to cpp file
abitmore Dec 17, 2021
91675d7
Wrap long lines
abitmore Dec 17, 2021
03b9057
Adapt static_variant and map for ElasticSearch
abitmore Dec 17, 2021
0947fed
Add logging
abitmore Dec 17, 2021
d03ef2d
Fix adaption of proposed_ops for ElasticSearch
abitmore Dec 17, 2021
7152dbb
Fix adaption of fee schedule update op for ES
abitmore Dec 17, 2021
aff8e72
Fix adaption of arrays for ES
abitmore Dec 17, 2021
345942b
Fix adaption of maps for ES
abitmore Dec 18, 2021
2e62d8e
Remove unnecessary code
abitmore Dec 18, 2021
c87dc0e
Merge develop branch into es7_fix
abitmore Dec 20, 2021
601925b
Switch type from 'data' to default '_doc' for ES
abitmore Dec 20, 2021
1402c4b
Move generateIndexName(...) from util to ES plugin
abitmore Dec 20, 2021
0549927
Update ES tests to accommodate data type changes
abitmore Dec 20, 2021
b037edc
Rename variables for better readability
abitmore Dec 20, 2021
8397d5d
Assume ES version is 7 or above by default
abitmore Dec 20, 2021
87abc8b
Switch type from 'data' to '_doc' for search in ES
abitmore Dec 20, 2021
ce7a639
Remove generateIndexName function from header file
abitmore Dec 20, 2021
e2d8baf
Update log messages
abitmore Dec 20, 2021
7edb5ce
Fix ES tests for the generateIndexName change
abitmore Dec 20, 2021
679e645
Check ES on plugin initialization
abitmore Dec 20, 2021
149b285
Update a comment
abitmore Dec 20, 2021
eb1b575
Use ES 7.16.2 in Github Actions workflows
abitmore Dec 21, 2021
3907840
Refactor code to fix code smells
abitmore Dec 21, 2021
b4497c4
Wrap long lines
abitmore Dec 21, 2021
89e4276
Fix Github Actions Ubuntu debug build
abitmore Dec 21, 2021
a1c6bbe
Fix a code smell
abitmore Dec 21, 2021
76f4438
Make with -j1 in Github Actions Ubuntu debug build
abitmore Dec 21, 2021
577fc9e
Merge pull request #1997 from bitshares/es7_fix
abitmore Dec 22, 2021
09b9116
Merge develop branch
abitmore Dec 22, 2021
ab64829
Fix code smells
abitmore Dec 22, 2021
38d5b28
Simplify code about adaption of nonce for ES
abitmore Dec 22, 2021
ba39422
Adapt more maps as objects for ES
abitmore Dec 24, 2021
e28cb30
Fix adaption of strings in maps or static variants
abitmore Dec 24, 2021
79993e2
Move es_data_adaptor into utilities namespace
abitmore Dec 24, 2021
0eed923
Merge adaptor_struct in es_objects into utilities
abitmore Dec 24, 2021
9c9a625
Merge branch pr-2380-objs-in-es-his into testnet
abitmore Dec 24, 2021
67e6733
Try to fix genesis data process in es_objects
abitmore Dec 24, 2021
952a326
Insert genesis objects into ES in smaller bulks
abitmore Dec 25, 2021
4f4f8a4
Insert bitasset data in genesis into ES
abitmore Dec 25, 2021
695187c
Move program options of es_objects into a struct
abitmore Dec 25, 2021
638e2e1
Merge branch 'pr-2380-objs-in-es-his'
abitmore Dec 25, 2021
b02337e
Adapt htlc_preimage_hash as an object for ES
abitmore Dec 25, 2021
e1e8313
Merge 'pr-2380-objs-in-es-his' into test-es
abitmore Dec 25, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions .github/workflows/build-and-test.ubuntu-debug.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch:
image: docker://elasticsearch:7.10.1
image: docker://elasticsearch:7.16.2
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
steps:
- name: Install dependencies
Expand Down Expand Up @@ -51,14 +51,14 @@ jobs:
pwd
df -h .
mkdir -p _build
sudo mkdir -p /_build/libraries /_build/programs /mnt/_build/tests
sudo chmod a+rwx /_build/libraries /_build/programs /mnt/_build/tests
sudo mkdir -p /_build/libraries /_build/programs /_build/tests /mnt/_build
sudo chmod a+rwx /_build/libraries /_build/programs /_build/tests
ln -s /_build/libraries _build/libraries
ln -s /_build/programs _build/programs
ln -s /mnt/_build/tests _build/tests
ln -s /_build/tests _build/tests
sudo ln -s /_build/libraries /mnt/_build/libraries
sudo ln -s /_build/programs /mnt/_build/programs
sudo ln -s /mnt/_build/tests /_build/tests
sudo ln -s /_build/tests /mnt/_build/tests
ls -al _build
pushd _build
export -n BOOST_ROOT BOOST_INCLUDEDIR BOOST_LIBRARYDIR
Expand All @@ -83,13 +83,13 @@ jobs:
export CCACHE_DIR="$GITHUB_WORKSPACE/ccache"
mkdir -p "$CCACHE_DIR"
df -h
make -j 2 -C _build chain_test
make -j 2 -C _build cli_test
make -j 2 -C _build app_test
make -j 2 -C _build es_test
make -j 2 -C _build cli_wallet
make -j 2 -C _build witness_node
make -j 2 -C _build
make -j 1 -C _build chain_test
make -j 1 -C _build cli_test
make -j 1 -C _build app_test
make -j 1 -C _build es_test
make -j 1 -C _build cli_wallet
make -j 1 -C _build witness_node
make -j 1 -C _build
df -h
du -hs _build/libraries/* _build/programs/* _build/tests/*
du -hs _build/*
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.ubuntu-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
runs-on: ${{ matrix.os }}
services:
elasticsearch:
image: docker://elasticsearch:7.10.1
image: docker://elasticsearch:7.16.2
options: --env discovery.type=single-node --publish 9200:9200 --publish 9300:9300
steps:
- name: Install dependencies
Expand Down
Loading