Skip to content

Commit 44df16a

Browse files
committed
Merge branch 'master' into asyncio-executor
# Conflicts: # hazelcast/internal/asyncio_client.py
2 parents b44040d + aa08459 commit 44df16a

7 files changed

Lines changed: 705 additions & 7 deletions

File tree

.github/workflows/coverage_runner.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,8 @@ jobs:
2626
id: composite
2727
uses: hazelcast/hazelcast-tpm/membership@main
2828
with:
29-
organization-name: 'hazelcast'
3029
member-name: ${{ github.actor }}
31-
token: ${{ secrets.PAT }}
30+
token: ${{ secrets.GH_TOKEN }}
3231

3332
python-versions:
3433
uses: ./.github/workflows/get-python-versions.yml

.github/workflows/nightly_runner.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,15 @@ jobs:
4343
with:
4444
secret-ids: |
4545
HAZELCAST_ENTERPRISE_KEY,CN/HZ_LICENSE_KEY
46+
- uses: hazelcast/docker-actions/get-jfrog-credentials@master
47+
id: jfrog
48+
with:
49+
aws-role-to-assume: ${{ secrets.AWS_HAZELCAST_OIDC_GITHUB_ACTIONS_ROLE_ARN }}
50+
jfrog-oidc-provider-name: ${{ github.repository_owner }}-snapshot-internal
4651
- name: Run tests
4752
env:
48-
HZ_SNAPSHOT_INTERNAL_USERNAME: ${{ secrets.HZ_SNAPSHOT_INTERNAL_USERNAME }}
49-
HZ_SNAPSHOT_INTERNAL_PASSWORD: ${{ secrets.HZ_SNAPSHOT_INTERNAL_PASSWORD }}
53+
HZ_SNAPSHOT_INTERNAL_USERNAME: ${{ steps.jfrog.outputs.user }}
54+
HZ_SNAPSHOT_INTERNAL_PASSWORD: ${{ steps.jfrog.outputs.token }}
5055
run: python run_tests.py
5156
- name: Upload remote controller logs on test failure
5257
uses: actions/upload-artifact@v4

hazelcast/internal/asyncio_client.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
from hazelcast.internal.asyncio_compact import CompactSchemaService
88
from hazelcast.config import Config, IndexConfig
99
from hazelcast.internal.asyncio_connection import ConnectionManager, DefaultAsyncioAddressProvider
10-
from hazelcast.core import DistributedObjectEvent, DistributedObjectInfo
10+
from hazelcast.core import DistributedObjectEvent
1111
from hazelcast.discovery import HazelcastCloudAddressProvider
1212
from hazelcast.errors import IllegalStateError, InvalidConfigurationError
1313
from hazelcast.internal.asyncio_invocation import InvocationService, Invocation
@@ -18,14 +18,14 @@
1818
from hazelcast.internal.asyncio_partition import PartitionService, InternalPartitionService
1919
from hazelcast.protocol.codec import (
2020
client_add_distributed_object_listener_codec,
21-
client_get_distributed_objects_codec,
2221
client_remove_distributed_object_listener_codec,
2322
dynamic_config_add_vector_collection_config_codec,
2423
)
2524
from hazelcast.internal.asyncio_proxy.manager import (
2625
EXECUTOR_SERVICE,
2726
LIST_SERVICE,
2827
MAP_SERVICE,
28+
MULTI_MAP_SERVICE,
2929
ProxyManager,
3030
REPLICATED_MAP_SERVICE,
3131
VECTOR_SERVICE,
@@ -34,6 +34,7 @@
3434
from hazelcast.internal.asyncio_proxy.executor import Executor
3535
from hazelcast.internal.asyncio_proxy.list import List
3636
from hazelcast.internal.asyncio_proxy.map import Map
37+
from hazelcast.internal.asyncio_proxy.multi_map import MultiMap
3738
from hazelcast.internal.asyncio_proxy.replicated_map import ReplicatedMap
3839
from hazelcast.internal.asyncio_reactor import AsyncioReactor
3940
from hazelcast.serialization import SerializationServiceV1
@@ -287,6 +288,17 @@ async def get_map(self, name: str) -> Map[KeyType, ValueType]:
287288
"""
288289
return await self._proxy_manager.get_or_create(MAP_SERVICE, name)
289290

291+
async def get_multi_map(self, name: str) -> MultiMap[KeyType, ValueType]:
292+
"""Returns the distributed MultiMap instance with the specified name.
293+
294+
Args:
295+
name: Name of the distributed MultiMap.
296+
297+
Returns:
298+
Distributed MultiMap instance with the specified name.
299+
"""
300+
return await self._proxy_manager.get_or_create(MULTI_MAP_SERVICE, name)
301+
290302
async def get_replicated_map(self, name: str) -> ReplicatedMap[KeyType, ValueType]:
291303
"""Returns the distributed ReplicatedMap instance with the specified
292304
name.

hazelcast/internal/asyncio_proxy/manager.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
from hazelcast.internal.asyncio_proxy.executor import create_executor_proxy
55
from hazelcast.internal.asyncio_proxy.list import create_list_proxy
6+
from hazelcast.internal.asyncio_proxy.multi_map import create_multi_map_proxy
67
from hazelcast.internal.asyncio_proxy.vector_collection import (
78
create_vector_collection_proxy,
89
)
@@ -16,6 +17,7 @@
1617
EXECUTOR_SERVICE = "hz:impl:executorService"
1718
LIST_SERVICE = "hz:impl:listService"
1819
MAP_SERVICE = "hz:impl:mapService"
20+
MULTI_MAP_SERVICE = "hz:impl:multiMapService"
1921
REPLICATED_MAP_SERVICE = "hz:impl:replicatedMapService"
2022
VECTOR_SERVICE = "hz:service:vector"
2123

@@ -26,6 +28,7 @@
2628
EXECUTOR_SERVICE: create_executor_proxy,
2729
LIST_SERVICE: create_list_proxy,
2830
MAP_SERVICE: create_map_proxy,
31+
MULTI_MAP_SERVICE: create_multi_map_proxy,
2932
REPLICATED_MAP_SERVICE: create_replicated_map_proxy,
3033
VECTOR_SERVICE: create_vector_collection_proxy,
3134
}

0 commit comments

Comments
 (0)