Skip to content

Commit 650fe6d

Browse files
committed
Fixed readme & generated output (PR inputs)
1 parent 9a52716 commit 650fe6d

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Note: Above command also generates a log file `logfile_name.txt` to avoid log ou
4444
- Validation job will report differences as “ERRORS” in the log file as shown below
4545

4646
```
47-
22/09/27 11:21:24 ERROR DiffJobSession: Data mismatch found - Key: ek-1 %% mn1 %% c1 %% true Data: (Index: 4 Source: 30 Astra: 20 )
47+
22/09/27 11:21:24 ERROR DiffJobSession: Data mismatch found - Key: ek-1 %% mn1 %% c1 %% true Data: (Index: 4 Origin: 30 Target: 20 )
4848
22/09/27 11:21:24 ERROR DiffJobSession: Corrected mismatch data in Astra: ek-1 %% mn1 %% c1 %% true
4949
22/09/27 11:21:24 ERROR DiffJobSession: Data is missing in Astra: ek-2 %% mn2 %% c2 %% true
5050
22/09/27 11:21:24 ERROR DiffJobSession: Corrected missing data in Astra: ek-2 %% mn2 %% c2 %% true
@@ -53,13 +53,13 @@ Note: Above command also generates a log file `logfile_name.txt` to avoid log ou
5353
- Please grep for all `ERROR` from the output log files to get the list of missing and mismatched records.
5454
- Note that it lists differences by partition key values.
5555
- The Validation job can also be run in an AutoCorrect mode. This mode can
56-
- Add any missing records from source to target
57-
- Fix any inconsistencies between source and target (makes target same as source).
56+
- Add any missing records from origin to target
57+
- Fix any inconsistencies between origin and target (makes target same as origin).
5858
- Enable/disable this feature using one or both of the below setting in the config file
5959

6060
```
61-
spark.destination.autocorrect.missing true|false
62-
spark.destination.autocorrect.mismatch true|false
61+
spark.target.autocorrect.mismatch true|false
62+
spark.target.custom.writeTime true|false
6363
```
6464

6565
# Migrating specific partition ranges
@@ -83,8 +83,8 @@ This mode is specifically useful to processes a subset of partition-ranges that
8383
- [Counter tables](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_using/useCountersConcept.html)
8484
- Preserve [writetimes](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_reference/cql_commands/cqlSelect.html#cqlSelect__retrieving-the-datetime-a-write-occurred-p) and [TTL](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_reference/cql_commands/cqlSelect.html#cqlSelect__ref-select-ttl-p)
8585
- Advanced DataTypes ([Sets](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_reference/refDataTypes.html#refDataTypes__set), [Lists](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_reference/refDataTypes.html#refDataTypes__list), [Maps](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_reference/refDataTypes.html#refDataTypes__map), [UDTs](https://docs.datastax.com/en/dse/6.8/cql/cql/cql_reference/refDataTypes.html#refDataTypes__udt))
86-
- Filter records from source using writetime
86+
- Filter records from origin using writetime
8787
- SSL Support (including custom cipher algorithms)
88-
- Migrate from any Cassandra source ([Apache Cassandra](https://cassandra.apache.org)/[DataStax Enterprise (DSE)](https://www.datastax.com/products/datastax-enterprise)/[DataStax Astra DB](https://www.datastax.com/products/datastax-astra)) to any Cassandra target ([Apache Cassandra](https://cassandra.apache.org)/[DataStax Enterprise (DSE)](https://www.datastax.com/products/datastax-enterprise)/[DataStax Astra DB](https://www.datastax.com/products/datastax-astra))
88+
- Migrate from any Cassandra origin ([Apache Cassandra](https://cassandra.apache.org)/[DataStax Enterprise (DSE)](https://www.datastax.com/products/datastax-enterprise)/[DataStax Astra DB](https://www.datastax.com/products/datastax-astra)) to any Cassandra target ([Apache Cassandra](https://cassandra.apache.org)/[DataStax Enterprise (DSE)](https://www.datastax.com/products/datastax-enterprise)/[DataStax Astra DB](https://www.datastax.com/products/datastax-astra))
8989
- Validate migration accuracy and performance using a smaller randomized data-set
9090
- Custom writetime

src/main/java/datastax/astra/migrate/DiffJobSession.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,13 +130,13 @@ public void printCounts(String finalStr) {
130130
private void diff(Row sourceRow, Row astraRow) {
131131
if (astraRow == null) {
132132
missingCounter.incrementAndGet();
133-
logger.error("Data is missing in Astra: " + getKey(sourceRow));
133+
logger.error("Data is missing in Target: " + getKey(sourceRow));
134134
//correct data
135135

136136
if (autoCorrectMissing) {
137137
astraSession.execute(bindInsert(astraInsertStatement, sourceRow, null));
138138
correctedMissingCounter.incrementAndGet();
139-
logger.error("Corrected missing data in Astra: " + getKey(sourceRow));
139+
logger.error("Corrected missing data in Target: " + getKey(sourceRow));
140140
}
141141

142142
return;
@@ -154,7 +154,7 @@ private void diff(Row sourceRow, Row astraRow) {
154154
astraSession.execute(bindInsert(astraInsertStatement, sourceRow, null));
155155
}
156156
correctedMismatchCounter.incrementAndGet();
157-
logger.error("Corrected mismatch data in Astra: " + getKey(sourceRow));
157+
logger.error("Corrected mismatch data in Target: " + getKey(sourceRow));
158158
}
159159

160160
return;
@@ -172,7 +172,7 @@ private String isDifferent(Row sourceRow, Row astraRow) {
172172

173173
boolean isDiff = dataType.diff(source, astra);
174174
if (isDiff) {
175-
diffData.append(" (Index: " + index + " Source: " + source + " Astra: " + astra + " ) ");
175+
diffData.append(" (Index: " + index + " Origin: " + source + " Target: " + astra + " ) ");
176176
}
177177
});
178178

0 commit comments

Comments
 (0)