Skip to content

Commit

Permalink
chore: update benchmark paths (#9305)
Browse files Browse the repository at this point in the history
**Description**

Update benchmarks paths with recent repo move.

**Checklist**

- [X] Code compiles correctly and linting passes locally
  • Loading branch information
ryanfoxtyler authored Feb 14, 2025
1 parent 84415a7 commit fbcd367
Show file tree
Hide file tree
Showing 11 changed files with 43 additions and 43 deletions.
14 changes: 7 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -911,7 +911,7 @@ adhere to [Semantic Versioning](https://semver.org) starting `v22.0.0`.
https://github.com/hypermodeinc/dgraph/pull/8479
https://github.com/hypermodeinc/dgraph/pull/8488
https://github.com/hypermodeinc/dgraph/pull/8433)
- [Coveralls](https://coveralls.io/github/dgraph-io/dgraph?branch=main) on CI is enhanced to
- [Coveralls](https://coveralls.io/github/hypermodeinc/dggraph?branch=main) on CI is enhanced to
measure code coverage for integration tests (https://github.com/hypermodeinc/dgraph/pull/8494)
- [**LDBC Benchmarking**](https://ldbcouncil.org) in enabled on
[CI](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-dgraph-ldbc-tests.yml)
Expand Down Expand Up @@ -1415,7 +1415,7 @@ https://discuss.dgraph.io/t/dgraph-v22-0-0-rc1-20221003-release-candidate/17839
- Enabled
[Load Tests](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-dgraph-load-tests.yml)
- Enabled [Linters](https://github.com/hypermodeinc/dgraph/actions/workflows/ci-golang-lint.yml)
- Enabled [Code Coverage](https://coveralls.io/github/dgraph-io/dgraph?branch=main)
- Enabled [Code Coverage](https://coveralls.io/github/hypermodeinc/dggraph?branch=main)
- **CI Security**
- Configured to run with
[Github Actions](https://github.com/hypermodeinc/dgraph/blob/main/.github/workflows/ci-aqua-security-trivy-tests.yml)
Expand Down Expand Up @@ -4813,8 +4813,8 @@ Users can set `port_offset` flag, to modify these fixed ports.

- Facets response structure has been modified and is a lot flatter. Facet key is now
`predicate|facet_name`. Examples for
[Go client](https://godoc.org/github.com/dgraph-io/dgraph/client#example-Txn-Mutate-Facets) and
[HTTP](https://dgraph.io/docs/query-language/#facets-edge-attributes).
[Go client](https://godoc.org/github.com/hypermodeinc/dggraph/client#example-Txn-Mutate-Facets)
and [HTTP](https://dgraph.io/docs/query-language/#facets-edge-attributes).
- Query latency is now returned as numeric (ns) instead of string.
- [`Recurse`](https://dgraph.io/docs/query-language/#recurse-query) is now a directive. So queries
with `recurse` keyword at root won't work anymore.
Expand Down Expand Up @@ -4855,10 +4855,10 @@ Users can set `port_offset` flag, to modify these fixed ports.
`client.Unmarshal` method also goes away from the Go client. Users can use `json.Unmarshal` for
unmarshalling the response.
- Response for predicate of type `geo` can be unmarshalled into a struct. Example
[here](https://godoc.org/github.com/dgraph-io/dgraph/client#example-package--SetObject).
[here](https://godoc.org/github.com/hypermodeinc/dggraph/client#example-package--SetObject).
- `Node` and `Edge` structs go away along with the `SetValue...` methods. We recommend using
[`SetJson`](https://godoc.org/github.com/dgraph-io/dgraph/client#example-package--SetObject) and
`DeleteJson` fields to do mutations.
[`SetJson`](https://godoc.org/github.com/hypermodeinc/dggraph/client#example-package--SetObject)
and `DeleteJson` fields to do mutations.
- Examples of how to use transactions using the client can be found at
https://dgraph.io/docs/clients/#go.

Expand Down
2 changes: 1 addition & 1 deletion algo/benchmarks
Original file line number Diff line number Diff line change
Expand Up @@ -167,4 +167,4 @@ BenchmarkListIntersectRatio/compressed:IntersectWithLin:ratio=1:size=1000000:ove
BenchmarkListIntersectRatio/compressed:IntersectWithBin:ratio=1:size=1000000:overlap=0.01:-4 30 38617011 ns/op

PASS
ok github.com/dgraph-io/dgraph/algo 206.835s
ok github.com/hypermodeinc/dgraph/algo 206.835s
32 changes: 16 additions & 16 deletions chunker/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,21 +5,21 @@ go tool pprof --alloc_objects uidassigner heap.prof
Dropped 41 nodes (cum <= 1039438)
Showing top 10 nodes out of 31 (cum >= 8566234)
flat flat% sum% cum cum%
55529704 26.71% 26.71% 55529704 26.71% github.com/dgraph-io/dgraph/rdf.Parse
28255068 13.59% 40.30% 30647245 14.74% github.com/dgraph-io/dgraph/posting.(*List).getPostingList
55529704 26.71% 26.71% 55529704 26.71% github.com/hypermodeinc/dggraph/rdf.Parse
28255068 13.59% 40.30% 30647245 14.74% github.com/hypermodeinc/dggraph/posting.(*List).getPostingList
20406729 9.82% 50.12% 20406729 9.82% github.com/zond/gotomic.newRealEntryWithHashCode
17777182 8.55% 58.67% 17777182 8.55% strings.makeCutsetFunc
17582839 8.46% 67.13% 17706815 8.52% github.com/dgraph-io/dgraph/loader.(*state).readLines
15139047 7.28% 74.41% 88445933 42.55% github.com/dgraph-io/dgraph/loader.(*state).parseStream
17582839 8.46% 67.13% 17706815 8.52% github.com/hypermodeinc/dggraph/loader.(*state).readLines
15139047 7.28% 74.41% 88445933 42.55% github.com/hypermodeinc/dggraph/loader.(*state).parseStream
12927366 6.22% 80.63% 12927366 6.22% github.com/zond/gotomic.(*element).search
10789028 5.19% 85.82% 66411362 31.95% github.com/dgraph-io/dgraph/posting.GetOrCreate
10789028 5.19% 85.82% 66411362 31.95% github.com/hypermodeinc/dggraph/posting.GetOrCreate
9453856 4.55% 90.37% 9453856 4.55% github.com/zond/gotomic.(*hashHit).search
8566234 4.12% 94.49% 8566234 4.12% github.com/dgraph-io/dgraph/uid.stringKey
8566234 4.12% 94.49% 8566234 4.12% github.com/hypermodeinc/dggraph/uid.stringKey


(pprof) list rdf.Parse
Total: 207887723
ROUTINE ======================== github.com/dgraph-io/dgraph/rdf.Parse in /home/mrjn/go/src/github.com/dgraph-io/dgraph/rdf/parse.go
ROUTINE ======================== github.com/hypermodeinc/dggraph/rdf.Parse in /home/mrjn/go/src/github.com/hypermodeinc/dggraph/rdf/parse.go
55529704 55529704 (flat, cum) 26.71% of Total
. . 118: }
. . 119: return val[1 : len(val)-1]
Expand All @@ -43,14 +43,14 @@ Showing top 10 nodes out of 62 (cum >= 18180150)
flat flat% sum% cum cum%
103445194 18.46% 18.46% 103445194 18.46% github.com/Sirupsen/logrus.(*Entry).WithFields
65448918 11.68% 30.14% 163184489 29.12% github.com/Sirupsen/logrus.(*Entry).WithField
48366300 8.63% 38.77% 203838187 36.37% github.com/dgraph-io/dgraph/posting.(*List).get
39789719 7.10% 45.87% 49276181 8.79% github.com/dgraph-io/dgraph/posting.(*List).getPostingList
36642638 6.54% 52.41% 36642638 6.54% github.com/dgraph-io/dgraph/lex.NewLexer
48366300 8.63% 38.77% 203838187 36.37% github.com/hypermodeinc/dggraph/posting.(*List).get
39789719 7.10% 45.87% 49276181 8.79% github.com/hypermodeinc/dggraph/posting.(*List).getPostingList
36642638 6.54% 52.41% 36642638 6.54% github.com/hypermodeinc/dggraph/lex.NewLexer
35190301 6.28% 58.69% 35190301 6.28% github.com/google/flatbuffers/go.(*Builder).growByteBuffer
31392455 5.60% 64.29% 31392455 5.60% github.com/zond/gotomic.newRealEntryWithHashCode
25895676 4.62% 68.91% 25895676 4.62% github.com/zond/gotomic.(*element).search
18546971 3.31% 72.22% 72863016 13.00% github.com/dgraph-io/dgraph/loader.(*state).parseStream
18090764 3.23% 75.45% 18180150 3.24% github.com/dgraph-io/dgraph/loader.(*state).readLines
18546971 3.31% 72.22% 72863016 13.00% github.com/hypermodeinc/dggraph/loader.(*state).parseStream
18090764 3.23% 75.45% 18180150 3.24% github.com/hypermodeinc/dggraph/loader.(*state).readLines

After a few more discussions, I realized that lexer didn't need to be allocated on the heap.
So, I switched it to be allocated on stack. These are the results.
Expand All @@ -62,14 +62,14 @@ Entering interactive mode (type "help" for commands)
Dropped 73 nodes (cum <= 8.48MB)
Showing top 10 nodes out of 52 (cum >= 161.50MB)
flat flat% sum% cum cum%
304.56MB 17.95% 17.95% 304.56MB 17.95% github.com/dgraph-io/dgraph/posting.NewList
304.56MB 17.95% 17.95% 304.56MB 17.95% github.com/hypermodeinc/dggraph/posting.NewList
209.55MB 12.35% 30.30% 209.55MB 12.35% github.com/Sirupsen/logrus.(*Entry).WithFields
207.55MB 12.23% 42.54% 417.10MB 24.58% github.com/Sirupsen/logrus.(*Entry).WithField
108MB 6.37% 48.90% 108MB 6.37% github.com/dgraph-io/dgraph/uid.(*lockManager).newOrExisting
108MB 6.37% 48.90% 108MB 6.37% github.com/hypermodeinc/dggraph/uid.(*lockManager).newOrExisting
88MB 5.19% 54.09% 88MB 5.19% github.com/zond/gotomic.newMockEntry
85.51MB 5.04% 59.13% 85.51MB 5.04% github.com/google/flatbuffers/go.(*Builder).growByteBuffer
78.01MB 4.60% 63.73% 78.01MB 4.60% github.com/dgraph-io/dgraph/posting.Key
78.01MB 4.60% 68.32% 78.51MB 4.63% github.com/dgraph-io/dgraph/uid.stringKey
78.01MB 4.60% 63.73% 78.01MB 4.60% github.com/hypermodeinc/dggraph/posting.Key
78.01MB 4.60% 68.32% 78.51MB 4.63% github.com/hypermodeinc/dggraph/uid.stringKey
76MB 4.48% 72.80% 76MB 4.48% github.com/zond/gotomic.newRealEntryWithHashCode
73.50MB 4.33% 77.14% 161.50MB 9.52% github.com/zond/gotomic.(*Hash).getBucketByIndex

Expand Down
4 changes: 2 additions & 2 deletions contrib/manual_tests/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@ readonly ENCRYPTION_KEY_PATH="${DGRAPH_PATH}/encryption_key_file"
readonly ACL_SECRET_PATH="${DGRAPH_PATH}/acl_secret_file"
readonly TLS_PATH="${DGRAPH_PATH}/tls"

readonly DATASET_1MILLION_FILE_URL='https://github.com/dgraph-io/benchmarks/blob/master/data/1million.rdf.gz?raw=true'
readonly DATASET_1MILLION_FILE_URL='https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/1million.rdf.gz?raw=true'
readonly DATASET_1MILLION_FILE_PATH="${DATA_PATH}/1million.rdf.gz"

readonly DATASET_1MILLION_SCHEMA_URL='https://github.com/dgraph-io/benchmarks/blob/master/data/1million.schema?raw=true'
readonly DATASET_1MILLION_SCHEMA_URL='https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/1million.schema?raw=true'
readonly DATASET_1MILLION_SCHEMA_PATH="${DATA_PATH}/1million.schema"

source "log.sh"
Expand Down
2 changes: 1 addition & 1 deletion graphql/bench/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Command: go test -bench=. -benchtime=60s
go test -bench=. -benchtime=60s
goos: linux
goarch: amd64
pkg: github.com/dgraph-io/dgraph/graphql/e2e/auth/bench
pkg: github.com/hypermodeinc/dgraph/graphql/e2e/auth/bench
Auth
BenchmarkNestedQuery-8 88 815315761 ns/op
BenchmarkOneLevelQuery-8 4357 15626384 ns/op
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const (
baseDir = "."
dataDir = baseDir + "/__data"
resultsDir = baseDir + "/results"
benchmarksDir = baseDir + "/benchmarks"
benchmarksDir = baseDir + "/dgraph-benchmarks"
benchQueriesDirName = "queries"
benchSchemaFileName = "schema.graphql"
tempDir = baseDir + "/temp"
Expand Down
2 changes: 1 addition & 1 deletion paper/dgraph.tex
Original file line number Diff line number Diff line change
Expand Up @@ -990,7 +990,7 @@ \section{Acknowledgments}
core dev team and extended community. This work also wouldn't have been possible
without funding from our investors. A full list of contributors is present here:
\begin{center}
{\tt github.com/dgraph-io/dgraph/graphs/contributors}
{\tt github.com/hypermodeinc/dgraph/graphs/contributors}
\end{center}

Dgraph is an open source software, available on
Expand Down
4 changes: 2 additions & 2 deletions systest/1million/test-reindex.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
set -e
readonly SRCDIR=$(dirname "$0")

BENCHMARKS_REPO="$(pwd)/benchmarks"
BENCHMARKS_REPO="$(pwd)/dgraph-benchmarks"
NO_INDEX_SCHEMA_FILE="${BENCHMARKS_REPO}/data/1million-noindex.schema"
SCHEMA_FILE="${BENCHMARKS_REPO}/data/1million.schema"
DATA_FILE="${BENCHMARKS_REPO}/data/1million.rdf.gz"
Expand All @@ -17,7 +17,7 @@ function DockerCompose {
}

Info "cloning benchmarks repo"
BENCHMARKS_URL=https://github.com/dgraph-io/benchmarks/blob/master/data
BENCHMARKS_URL=https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data
rm -rf "${BENCHMARKS_REPO}"
mkdir -p "${BENCHMARKS_REPO}"/data
wget -O "${NO_INDEX_SCHEMA_FILE}" "${BENCHMARKS_URL}"/1million-noindex.schema?raw=true
Expand Down
2 changes: 1 addition & 1 deletion systest/21million/test-21million.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -e
readonly ME=${0##*/}
readonly SRCDIR=$(dirname "$0")

BENCHMARKS_REPO="${BENCHMARKS_REPO:-$(go env GOPATH)/src/github.com/dgraph-io/benchmarks}"
BENCHMARKS_REPO="${BENCHMARKS_REPO:-$(go env GOPATH)/src/github.com/hypermodeinc/dgraph-benchmarks}"
SCHEMA_FILE="${BENCHMARKS_REPO}/data/21million.schema"
DATA_FILE="${BENCHMARKS_REPO}/data/21million.rdf.gz"

Expand Down
8 changes: 4 additions & 4 deletions systest/loader-benchmark/loader-benchmark.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ set -e
readonly ME=${0##*/}
readonly SRCDIR=$(dirname "$0")

BENCHMARKS_REPO="https://github.com/dgraph-io/benchmarks"
BENCHMARKS_REPO="https://github.com/hypermodeinc/dgraph-benchmarks"
BENCHMARK_SIZE=${BENCHMARK_SIZE:=big}
SCHEMA_URL="${BENCHMARKS_REPO}/blob/master/data/21million.schema?raw=true"
SCHEMA_URL="${BENCHMARKS_REPO}/blob/main/data/21million.schema?raw=true"
DGRAPH_LOADER=${DGRAPH_LOADER:=bulk}

function Info {
Expand All @@ -23,9 +23,9 @@ if [[ ${BENCHMARK_SIZE} != small && ${BENCHMARK_SIZE} != big ]]; then
fi

if [[ ${BENCHMARK_SIZE} == small ]]; then
DATA_URL="${BENCHMARKS_REPO}/blob/master/data/1million.rdf.gz?raw=true"
DATA_URL="${BENCHMARKS_REPO}/blob/main/data/1million.rdf.gz?raw=true"
else
DATA_URL="${BENCHMARKS_REPO}/blob/master/data/21million.rdf.gz?raw=true"
DATA_URL="${BENCHMARKS_REPO}/blob/main/data/21million.rdf.gz?raw=true"
fi

if [[ ${DGRAPH_LOADER} != bulk && ${DGRAPH_LOADER} != live ]]; then
Expand Down
14 changes: 7 additions & 7 deletions t/t.go
Original file line number Diff line number Diff line change
Expand Up @@ -873,14 +873,14 @@ func isVectorPackage(pkg string) bool {
}

var datafiles = map[string]string{
"1million-noindex.schema": "https://github.com/dgraph-io/benchmarks/blob/master/data/1million-noindex.schema?raw=true",
"1million.schema": "https://github.com/dgraph-io/benchmarks/blob/master/data/1million.schema?raw=true",
"1million.rdf.gz": "https://github.com/dgraph-io/benchmarks/blob/master/data/1million.rdf.gz?raw=true",
"21million.schema": "https://github.com/dgraph-io/benchmarks/blob/master/data/21million.schema?raw=true",
"21million.rdf.gz": "https://github.com/dgraph-io/benchmarks/blob/master/data/21million.rdf.gz?raw=true",
"1million-noindex.schema": "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/1million-noindex.schema?raw=true",
"1million.schema": "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/1million.schema?raw=true",
"1million.rdf.gz": "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/1million.rdf.gz?raw=true",
"21million.schema": "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/21million.schema?raw=true",
"21million.rdf.gz": "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/data/21million.rdf.gz?raw=true",
}

var baseUrl = "https://github.com/dgraph-io/benchmarks/blob/master/ldbc/sf0.3/ldbc_rdf_0.3/"
var baseUrl = "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/ldbc/sf0.3/ldbc_rdf_0.3/"
var suffix = "?raw=true"

var rdfFileNames = [...]string{
Expand Down Expand Up @@ -910,7 +910,7 @@ var rdfFileNames = [...]string{
"workAt_0.rdf"}

var ldbcDataFiles = map[string]string{
"ldbcTypes.schema": "https://github.com/dgraph-io/benchmarks/blob/master/ldbc/sf0.3/ldbcTypes.schema?raw=true",
"ldbcTypes.schema": "https://github.com/hypermodeinc/dgraph-benchmarks/blob/main/ldbc/sf0.3/ldbcTypes.schema?raw=true",
}

func downloadDataFiles() {
Expand Down

0 comments on commit fbcd367

Please sign in to comment.