Merge branch 'upstream-main'

Author: tae898

bindings/python/scripts/verify_wheel_platform_tag.py

@@ -80,10 +80,19 @@ def parse_wheel_tag(wheel_path: Path) -> tuple[tuple[int, int], str]:
 
 
 def main() -> int:
-    parser = argparse.ArgumentParser(description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter)
+    parser = argparse.ArgumentParser(
+        description=__doc__, formatter_class=argparse.RawDescriptionHelpFormatter
+    )
     parser.add_argument("wheel", nargs="?", type=Path, help="Path to the .whl file")
-    parser.add_argument("jre", nargs="?", type=Path, help="Path to the bundled JRE/JDK directory")
-    parser.add_argument("--jre", dest="jre_only", type=Path, help="Inspect a JRE only and print its required tag")
+    parser.add_argument(
+        "jre", nargs="?", type=Path, help="Path to the bundled JRE/JDK directory"
+    )
+    parser.add_argument(
+        "--jre",
+        dest="jre_only",
+        type=Path,
+        help="Inspect a JRE only and print its required tag",
+    )
     args = parser.parse_args()
 
     if args.jre_only is not None:

bindings/python/tests/test_wheel_platform_tag.py

@@ -19,12 +19,15 @@
 
 import pytest
 
-
-SCRIPT_PATH = Path(__file__).resolve().parents[1] / "scripts" / "verify_wheel_platform_tag.py"
+SCRIPT_PATH = (
+    Path(__file__).resolve().parents[1] / "scripts" / "verify_wheel_platform_tag.py"
+)
 
 
 def _load_verifier():
-    spec = importlib.util.spec_from_file_location("verify_wheel_platform_tag", SCRIPT_PATH)
+    spec = importlib.util.spec_from_file_location(
+        "verify_wheel_platform_tag", SCRIPT_PATH
+    )
     module = importlib.util.module_from_spec(spec)
     assert spec.loader is not None
     spec.loader.exec_module(module)
@@ -62,7 +65,9 @@ def test_parse_wheel_tag_extracts_version_and_arch(tmp_path: Path) -> None:
     assert arch == "x86_64"
 
 
-def test_main_succeeds_when_tag_matches(tmp_path: Path, capsys: pytest.CaptureFixture[str]) -> None:
+def test_main_succeeds_when_tag_matches(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
     verifier = _load_verifier()
     jre_dir = tmp_path / "jre"
     jre_dir.mkdir()
@@ -76,7 +81,9 @@ def test_main_succeeds_when_tag_matches(tmp_path: Path, capsys: pytest.CaptureFi
     assert "OK" in capsys.readouterr().out
 
 
-def test_main_fails_when_tag_higher_than_jre(tmp_path: Path, capsys: pytest.CaptureFixture[str]) -> None:
+def test_main_fails_when_tag_higher_than_jre(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
     """Reproduces issue #4037: wheel tagged manylinux_2_35 but JRE only needs GLIBC_2.34."""
     verifier = _load_verifier()
     jre_dir = tmp_path / "jre"
@@ -93,7 +100,9 @@ def test_main_fails_when_tag_higher_than_jre(tmp_path: Path, capsys: pytest.Capt
     assert "manylinux_2_35" in captured.err or "manylinux_2_34" in captured.err
 
 
-def test_main_fails_when_tag_lower_than_jre(tmp_path: Path, capsys: pytest.CaptureFixture[str]) -> None:
+def test_main_fails_when_tag_lower_than_jre(
+    tmp_path: Path, capsys: pytest.CaptureFixture[str]
+) -> None:
     """A too-low tag would let the wheel install on systems where the JRE cannot run."""
     verifier = _load_verifier()
     jre_dir = tmp_path / "jre"

bolt/src/main/java/com/arcadedb/bolt/BoltNetworkExecutor.java

@@ -41,13 +41,13 @@
 import com.arcadedb.index.Index;
 import com.arcadedb.index.TypeIndex;
 import com.arcadedb.log.LogManager;
+import com.arcadedb.query.sql.executor.Result;
+import com.arcadedb.query.sql.executor.ResultSet;
 import com.arcadedb.schema.DocumentType;
 import com.arcadedb.schema.EdgeType;
 import com.arcadedb.schema.Property;
 import com.arcadedb.schema.Schema;
 import com.arcadedb.schema.VertexType;
-import com.arcadedb.query.sql.executor.Result;
-import com.arcadedb.query.sql.executor.ResultSet;
 import com.arcadedb.server.ArcadeDBServer;
 import com.arcadedb.server.security.ServerSecurityException;
 import com.arcadedb.server.security.ServerSecurityUser;
@@ -252,9 +252,9 @@ private boolean performHandshake() throws IOException {
       if (magic[0] == 0x16 && magic[1] == 0x03)
         LogManager.instance().log(this, Level.WARNING,
             """
-            TLS/SSL connection attempted on BOLT port but TLS is disabled. \
-            Configure arcadedb.bolt.ssl=OPTIONAL or REQUIRED to enable TLS, \
-            or use bolt:// (unencrypted) on the client""");
+                TLS/SSL connection attempted on BOLT port but TLS is disabled. \
+                Configure arcadedb.bolt.ssl=OPTIONAL or REQUIRED to enable TLS, \
+                or use bolt:// (unencrypted) on the client""");
       else
         LogManager.instance().log(this, Level.WARNING,
             "Invalid BOLT magic bytes: [%d, %d, %d, %d]", magic[0], magic[1], magic[2], magic[3]);
@@ -1083,7 +1083,8 @@ private boolean handleSystemQuery(final String query) throws IOException {
         || normalized.startsWith("show point index")
         || normalized.startsWith("show lookup index")
         || normalized.startsWith("show fulltext index")
-        || normalized.startsWith("show vector index")) {
+        || normalized.startsWith("show vector index")
+        || normalized.startsWith("show sparse_vector index")) {
       // SHOW INDEXES / SHOW ... INDEXES - list indexes from ArcadeDB schema
       currentFields = List.of("id", "name", "state", "populationPercent", "type", "entityType",
           "labelsOrTypes", "properties", "indexProvider", "owningConstraint", "lastRead", "readCount");
@@ -1266,6 +1267,7 @@ private static String mapIndexTypeToNeo4j(final Schema.INDEX_TYPE type) {
       case HASH -> "HASH";
       case FULL_TEXT -> "FULLTEXT";
       case LSM_VECTOR -> "VECTOR";
+      case LSM_SPARSE_VECTOR -> "SPARSE_VECTOR";
       case GEOSPATIAL -> "POINT";
     };
   }
@@ -1278,6 +1280,7 @@ private static String mapIndexTypeToProvider(final Schema.INDEX_TYPE type) {
       case HASH -> "hash-1.0";
       case FULL_TEXT -> "fulltext-1.0";
       case LSM_VECTOR -> "vector-2.0";
+      case LSM_SPARSE_VECTOR -> "sparse-vector-2.0";
       case GEOSPATIAL -> "point-1.0";
     };
   }
@@ -1295,6 +1298,8 @@ private static boolean indexTypeMatchesFilter(final String filter, final String
       return "FULLTEXT".equals(neoType);
     if (filter.startsWith("show vector index"))
       return "VECTOR".equals(neoType);
+    if (filter.startsWith("show sparse_vector index"))
+      return "SPARSE_VECTOR".equals(neoType);
     return true;
   }
 

bolt/src/test/java/com/arcadedb/bolt/BoltProtocolIT.java

@@ -23,14 +23,21 @@
 import com.arcadedb.schema.Schema;
 import com.arcadedb.schema.Type;
 import com.arcadedb.test.BaseGraphServerTest;
-
 import org.assertj.core.data.Offset;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
-import org.neo4j.driver.*;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Config;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.Result;
+import org.neo4j.driver.Session;
+import org.neo4j.driver.SessionConfig;
+import org.neo4j.driver.Transaction;
+import org.neo4j.driver.Values;
 import org.neo4j.driver.exceptions.ClientException;
 import org.neo4j.driver.summary.ResultSummary;
-import org.neo4j.driver.Values;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;
@@ -44,20 +51,18 @@
 import java.nio.ByteBuffer;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
-import java.util.Base64;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionStage;
-import java.util.concurrent.TimeUnit;
 import java.util.ArrayList;
+import java.util.Base64;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionStage;
+import java.util.concurrent.TimeUnit;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 
-import org.neo4j.driver.Record;
-
 /**
  * Integration tests for BOLT protocol using Neo4j Java driver.
  */
@@ -161,7 +166,8 @@ void createAndMatchEdge() {
         session.run("CREATE (a:EdgePerson {name: 'EdgeAlice'}), (b:EdgePerson {name: 'EdgeBob'})");
 
         // Create edge
-        session.run("MATCH (a:EdgePerson {name: 'EdgeAlice'}), (b:EdgePerson {name: 'EdgeBob'}) CREATE (a)-[:KNOWS {since: 2020}]->(b)");
+        session.run(
+            "MATCH (a:EdgePerson {name: 'EdgeAlice'}), (b:EdgePerson {name: 'EdgeBob'}) CREATE (a)-[:KNOWS {since: 2020}]->(b)");
 
         // Query edge
         final Result result = session.run(
@@ -877,7 +883,8 @@ void concurrentSessions() throws Exception {
 
     // Check for errors
     if (!errors.isEmpty()) {
-      throw new AssertionError("Concurrent test failed with " + errors.size() + " errors: " + errors.get(0).getMessage(), errors.get(0));
+      throw new AssertionError("Concurrent test failed with " + errors.size() + " errors: " + errors.get(0).getMessage(),
+          errors.get(0));
     }
   }
 
@@ -957,7 +964,8 @@ void largeParameterMap() {
         // Build a query that uses all parameters
         StringBuilder query = new StringBuilder("RETURN ");
         for (int i = 0; i < 50; i++) {
-          if (i > 0) query.append(" + ");
+          if (i > 0)
+            query.append(" + ");
           query.append("$param").append(i);
         }
         query.append(" AS sum");
@@ -1103,7 +1111,8 @@ void httpDiscoveryOnBoltPort() throws Exception {
   @Test
   void systemDatabaseDbmsComponents() {
     // Neo4j Desktop queries the "system" database for version info
-    try (final Driver driver = GraphDatabase.driver("bolt://localhost:7687", AuthTokens.basic("root", DEFAULT_PASSWORD_FOR_TESTS))) {
+    try (final Driver driver = GraphDatabase.driver("bolt://localhost:7687",
+        AuthTokens.basic("root", DEFAULT_PASSWORD_FOR_TESTS))) {
       try (final Session session = driver.session(SessionConfig.forDatabase("system"))) {
         final var result = session.run("CALL dbms.components()");
         assertThat(result.hasNext()).isTrue();
@@ -1615,4 +1624,18 @@ void showVectorIndexesReturnsEmptyWithoutVectorIndexes() {
       }
     }
   }
+
+  @Test
+  void showSparseVectorIndexesReturnsEmptyWithoutSparseVectorIndexes() {
+    try (Driver driver = getDriver()) {
+      try (Session session = driver.session(SessionConfig.forDatabase(getDatabaseName()))) {
+        final Result result = session.run("SHOW SPARSE_VECTOR INDEXES");
+        assertThat(result.keys()).containsExactly("id", "name", "state", "populationPercent", "type",
+            "entityType", "labelsOrTypes", "properties", "indexProvider", "owningConstraint", "lastRead", "readCount");
+        final List<Record> rows = result.list();
+        for (final Record r : rows)
+          assertThat(r.get("type").asString()).isEqualTo("SPARSE_VECTOR");
+      }
+    }
+  }
 }

console/pom.xml

@@ -30,7 +30,7 @@
     </parent>
 
     <properties>
-        <jline.version>4.0.12</jline.version>
+        <jline.version>4.0.14</jline.version>
     </properties>
 
     <artifactId>arcadedb-console</artifactId>

e2e-csharp/.gitignore

@@ -0,0 +1,6 @@
+bin/
+obj/
+*.user
+*.suo
+.vs/
+TestResults/

e2e-csharp/ArcadeDB.E2ETests/ArcadeDB.E2ETests.csproj

@@ -0,0 +1,34 @@
+<!--
+  Copyright © 2021-present Arcade Data Ltd (info@arcadedata.com)
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.5.1" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="Testcontainers" Version="4.11.0" />
+    <PackageReference Include="Npgsql" Version="10.0.2" />
+  </ItemGroup>
+</Project>

e2e-csharp/ArcadeDB.E2ETests/ArcadeDbFixture.cs

@@ -0,0 +1,94 @@
+/*
+ * Copyright © 2021-present Arcade Data Ltd (info@arcadedata.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+using System.Net;
+using System.Net.Http.Headers;
+using System.Text;
+using DotNet.Testcontainers.Builders;
+using DotNet.Testcontainers.Containers;
+using Npgsql;
+using Xunit;
+
+namespace ArcadeDB.E2ETests;
+
+[CollectionDefinition("ArcadeDB")]
+public class ArcadeDbCollection : ICollectionFixture<ArcadeDbFixture> { }
+
+public class ArcadeDbFixture : IAsyncLifetime
+{
+    private const string RootUser = "root";
+    private const string RootPassword = "playwithdata";
+
+    private IContainer _container = null!;
+    public NpgsqlDataSource DataSource { get; private set; } = null!;
+
+    public async Task InitializeAsync()
+    {
+        var imageEnv = Environment.GetEnvironmentVariable("ARCADEDB_DOCKER_IMAGE");
+        var image = string.IsNullOrWhiteSpace(imageEnv) ? "arcadedata/arcadedb:latest" : imageEnv;
+
+        _container = new ContainerBuilder(image)
+            .WithPortBinding(2480, true)
+            .WithPortBinding(5432, true)
+            .WithEnvironment("JAVA_OPTS",
+                $"-Darcadedb.server.rootPassword={RootPassword} " +
+                "-Darcadedb.server.plugins=PostgresProtocolPlugin")
+            .WithWaitStrategy(Wait.ForUnixContainer()
+                .UntilHttpRequestIsSucceeded(r => r
+                    .ForPort(2480)
+                    .ForPath("/api/v1/ready")
+                    .ForStatusCode(HttpStatusCode.NoContent)))
+            .Build();
+
+        await _container.StartAsync();
+
+        var httpPort = _container.GetMappedPublicPort(2480);
+        var authHeader = new AuthenticationHeaderValue(
+            "Basic", Convert.ToBase64String(Encoding.UTF8.GetBytes($"{RootUser}:{RootPassword}")));
+
+        using var http = new HttpClient();
+        http.DefaultRequestHeaders.Authorization = authHeader;
+        using var response = await http.PostAsync(
+            $"http://{_container.Hostname}:{httpPort}/api/v1/server",
+            new StringContent(
+                "{\"command\":\"create database NpgsqlE2ETest\"}",
+                Encoding.UTF8,
+                "application/json"));
+        response.EnsureSuccessStatusCode();
+
+        using var createTypeResponse = await http.PostAsync(
+            $"http://{_container.Hostname}:{httpPort}/api/v1/command/NpgsqlE2ETest",
+            new StringContent(
+                "{\"language\":\"sql\",\"command\":\"CREATE DOCUMENT TYPE NpgsqlTest\"}",
+                Encoding.UTF8,
+                "application/json"));
+        createTypeResponse.EnsureSuccessStatusCode();
+
+        var pgPort = _container.GetMappedPublicPort(5432);
+        DataSource = NpgsqlDataSource.Create(
+            $"Host={_container.Hostname};Port={pgPort};Database=NpgsqlE2ETest;" +
+            $"Username={RootUser};Password={RootPassword};SSL Mode=Disable;" +
+            "Server Compatibility Mode=NoTypeLoading;No Reset On Close=true");
+    }
+
+    public async Task DisposeAsync()
+    {
+        if (DataSource is not null)
+            await DataSource.DisposeAsync();
+        if (_container is not null)
+            await _container.DisposeAsync();
+    }
+}