Skip to content

Commit

Permalink
Problematic tests were fixed.
Browse files Browse the repository at this point in the history
Gradle version was updated.
Kotlin version was updated.
  • Loading branch information
andrii0lomakin committed Dec 5, 2023
1 parent 25973c0 commit c727086
Show file tree
Hide file tree
Showing 8 changed files with 24 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle_21.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Set up JDKs 21
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "21"
distribution: 'temurin'
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ fun shouldApplyDokka(project: Project): Boolean {
}

tasks.wrapper {
gradleVersion = "8.4"
gradleVersion = "8.5"
}

defaultTasks("assemble")
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
22 changes: 13 additions & 9 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ done
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -130,26 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -198,11 +202,11 @@ fi
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.
# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
4 changes: 2 additions & 2 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pluginManagement {
plugins {
id("org.jetbrains.kotlin.jvm") version ("1.9.20")
id("org.jetbrains.kotlin.jvm") version ("1.9.21")
id("org.jetbrains.dokka") version ("1.8.10")
id("com.github.hierynomus.license") version ("0.16.1")
id("io.codearte.nexus-staging") version ("0.30.0")
Expand All @@ -20,7 +20,7 @@ dependencyResolutionManagement {
versionCatalogs {
create("libs") {
version("kotlin-lang", "1.9")
version("kotlin", "1.9.20")
version("kotlin", "1.9.21")

version("kotlin-logging", "3.0.5")
version("lz4", "1.8.0")
Expand Down
6 changes: 3 additions & 3 deletions vectoriadb-server/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,8 @@ Below is an example command to achieve this:

```bash
docker run -d -p 9090:9090 \
-v /home/user/vectoriadb-server/logs:/vectoriadb-server/logs \
-v /home/user/vectoriadb-server/indexes:/vectoriadb-server/indexes \
-v /home/user/vectoriadb-server/conf:/vectoriadb-server/conf \
-v /home/user/vectoriadb-server/logs:/vectoriadb/logs \
-v /home/user/vectoriadb-server/indexes:/vectoriadb/indexes \
-v /home/user/vectoriadb-server/config:/vectoriadb/config \
--name vectoriadb-server vectoriadb/vectoriadb-server:latest
```
Original file line number Diff line number Diff line change
Expand Up @@ -1187,7 +1187,7 @@ public void onNext(IndexManagerOuterClass.UploadVectorsRequest value) {
vector[i] = value.getVectorComponents(i);
}
try {
store.add(vector, value.getId().toByteArray());
store.add(vector, value.getId().getId().toByteArray());
} catch (Exception e) {
var msg = "Failed to add vector to index " + indexName;
logger.error(msg, e);
Expand Down

0 comments on commit c727086

Please sign in to comment.