Skip to content

Commit a2706e9

Browse files
clunclun
authored
Merge pull request #46 from datastax/main
Update 2.0 Branch
2 parents 709502d + f6c8288 commit a2706e9

File tree

477 files changed

+22012
-6451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

477 files changed

+22012
-6451
lines changed

‎.github/workflows/ci-astra-col-db-dbadmin.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616
java_version:
1717
description: 'JDK version to use'
1818
required: true
19-
default: '11.0'
19+
default: '17.0'
2020
cache_pkg_mgr_name:
2121
description: 'Cache package manager to be used'
2222
required: true

‎.github/workflows/ci-astra-dev-new.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ on:
1717
java_version:
1818
description: 'JDK version to use'
1919
required: true
20-
default: '11.0'
20+
default: '17.0'
2121
cache_pkg_mgr_name:
2222
description: 'Cache package manager to be used'
2323
required: true
@@ -100,9 +100,9 @@ jobs:
100100
- name: Set up JDK
101101
uses: actions/setup-java@v4
102102
with:
103-
distribution: 'adopt'
104-
java-version: '11.0'
105-
cache: 'maven'
103+
distribution: ${{ inputs.java_distribution }}
104+
java-version: ${{ inputs.java_version }}
105+
cache: ${{ inputs.cache_pkg_mgr_name }}
106106

107107
- name: Run Maven Tests
108108
env:

‎.github/workflows/ci-astra-vectorize-bedrock-hf.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ on:
2424
java_version:
2525
description: 'JDK version to use'
2626
required: true
27-
default: '11.0'
27+
default: '17.0'
2828
cache_pkg_mgr_name:
2929
description: 'Cache package manager to be used'
3030
required: true

‎File

Whitespace-only changes.

‎Preferences...

Whitespace-only changes.

‎RELEASE.MD

Lines changed: 0 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -15,64 +15,6 @@ docker-compose -f ./docker-compose-dse.yml up -d
1515
docker run -it --rm --network container:$(docker ps | grep dse | cut -b 1-12) cassandra:latest cqlsh -u cassandra -p cassandra
1616
```
1717

18-
19-
```sql
20-
insert into default_keyspace.table_all_returns (
21-
p_ascii,
22-
p_bigint,
23-
p_blob,
24-
p_boolean,
25-
p_date,
26-
p_decimal,
27-
p_double,
28-
p_double_minf,
29-
p_double_pinf,
30-
p_duration,
31-
p_float,
32-
p_float_nan,
33-
p_inet,
34-
p_int,
35-
p_smallint,
36-
p_text,
37-
p_text_nulled,
38-
p_time,
39-
p_timestamp,
40-
p_tinyint,
41-
p_uuid,
42-
p_varint,
43-
p_vector,
44-
p_list_int,
45-
// p_map_text_int,
46-
p_set_int
47-
) values (
48-
'abc',
49-
10000,
50-
0xabcdef0123456789,
51-
true,
52-
'2015-05-03',
53-
123.45,
54-
987.6543,
55-
-Infinity,
56-
Infinity,
57-
12h48m,
58-
66.55,
59-
NaN,
60-
'12.34.56.78',
61-
2024,
62-
200,
63-
'måndag',
64-
null,
65-
'13:30:54.234',
66-
'2015-05-03 13:30:54.234',
67-
104,
68-
9c5b94b1-35ad-49bb-b118-8e8fc24abf80,
69-
123456789,
70-
[0.1, 0.2, 0.3],
71-
[4, 17, 34],
72-
// {'a': 101, 'b': 102},
73-
{9, 81}
74-
);
75-
```
7618
## Run the Test
7719

7820
### Prerequisites

‎Resources

Whitespace-only changes.

‎TEST.MD

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
## Run against Local HCD Instance
3+
(_to run locally your must have the data api running locally on op of HCD or DSE_)
4+
5+
```bash
6+
mvn clean test -Ptest_local
7+
```
8+
9+
> **Why it works ?**
10+
>
11+
> - In `pom.xml` the environment variable `ASTRA_DB_JAVA_TEST_ENV` is set to `local`
12+
> - Tests are annotated with
13+
>
14+
> ```java
15+
> @EnabledIfSystemProperty(named = "ASTRA_DB_JAVA_TEST_ENV", matches = "local")
16+
> @DisabledIfSystemProperty(named = "ASTRA_DB_JAVA_TEST_ENV", matches = "(?!local)")
17+
> public class MyTest {
18+
> }
19+
> ```
20+
21+
- To run with IDE make sure to set the environment variable `ASTRA_DB_JAVA_TEST_ENV` to `local` in your Run configuration
22+
23+
24+
## Run against Astra DEV
25+
26+
- `ASTRA_DB_APPLICATION_TOKEN_DEV` should be defined in your environment variables, it is not in the different POM for privacy reasons.
27+
28+
- To run with Maven (AWS,`eu-west-2`)
29+
30+
```bash
31+
mvn clean test -Ptest_astra_dev
32+
```
33+
34+
- To run with Maven on One particular region
35+
36+
```java
37+
mvn clean test -Ptest_astra_dev \
38+
-DASTRA_CLOUD_PROVIDER_DEV=GCP \
39+
-DASTRA_CLOUD_REGION_DEV=us-central-1
40+
```
41+
42+
- To run overriding also the token
43+
44+
```java
45+
mvn clean test \
46+
-Ptest_astra_dev \
47+
-DASTRA_CLOUD_PROVIDER_DEV=GCP \
48+
-DASTRA_CLOUD_REGION_DEV=us-central-1 \
49+
-ASTRA_DB_APPLICATION_TOKEN_DEV=AstraCS:... \
50+
-Dtest="com.datastax.astra.test.integration.*.*Test"
51+
```
52+

‎tools/pom.xml renamed to ‎astra-db-java-tools/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<parent>
88
<groupId>com.datastax.astra</groupId>
99
<artifactId>astra-db-java-parent</artifactId>
10-
<version>2.0.0-SNAPSHOT</version>
10+
<version>2.0.0-PREVIEW1-SNAPSHOT</version>
1111
</parent>
1212

1313
<dependencies>

‎tools/src/main/java/com/datastax/astra/tool/loader/csv/CsvLoader.java renamed to ‎astra-db-java-tools/src/main/java/com/datastax/astra/tool/loader/csv/CsvLoader.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.datastax.astra.tool.loader.csv;
22

33
import com.datastax.astra.client.collections.Collection;
4-
import com.datastax.astra.client.collections.documents.Document;
4+
import com.datastax.astra.client.collections.definition.documents.Document;
55
import com.opencsv.CSVReader;
66
import lombok.extern.slf4j.Slf4j;
77

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy