Skip to content

Commit b689bba

Browse files
feeblefakieTorch3333
feeblefakie
and
Torch3333
authored
Backport to branch(3) : Refactor to partially remove deprecated Value classes usage (#2330)
Co-authored-by: Vincent Guilpain <[email protected]>
1 parent dafaa61 commit b689bba

File tree

33 files changed

+882
-1124
lines changed

33 files changed

+882
-1124
lines changed

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoColumnValueIntegrationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.scalar.db.storage.dynamo;
22

33
import com.scalar.db.api.DistributedStorageColumnValueIntegrationTestBase;
4+
import com.scalar.db.io.Column;
45
import com.scalar.db.io.DataType;
5-
import com.scalar.db.io.Value;
66
import java.util.Map;
77
import java.util.Properties;
88
import java.util.Random;
@@ -20,26 +20,27 @@ protected Map<String, String> getCreationOptions() {
2020
}
2121

2222
@Override
23-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
23+
protected Column<?> getColumnWithRandomValue(
24+
Random random, String columnName, DataType dataType) {
2425
if (dataType == DataType.DOUBLE) {
2526
return DynamoTestUtils.getRandomDynamoDoubleValue(random, columnName);
2627
}
27-
return super.getRandomValue(random, columnName, dataType);
28+
return super.getColumnWithRandomValue(random, columnName, dataType);
2829
}
2930

3031
@Override
31-
protected Value<?> getMinValue(String columnName, DataType dataType) {
32+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
3233
if (dataType == DataType.DOUBLE) {
3334
return DynamoTestUtils.getMinDynamoDoubleValue(columnName);
3435
}
35-
return super.getMinValue(columnName, dataType);
36+
return super.getColumnWithMinValue(columnName, dataType);
3637
}
3738

3839
@Override
39-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
40+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
4041
if (dataType == DataType.DOUBLE) {
4142
return DynamoTestUtils.getMaxDynamoDoubleValue(columnName);
4243
}
43-
return super.getMaxValue(columnName, dataType);
44+
return super.getColumnWithMaxValue(columnName, dataType);
4445
}
4546
}

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoMultipleClusteringKeyScanIntegrationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.google.common.collect.ArrayListMultimap;
44
import com.google.common.collect.ListMultimap;
55
import com.scalar.db.api.DistributedStorageMultipleClusteringKeyScanIntegrationTestBase;
6+
import com.scalar.db.io.Column;
67
import com.scalar.db.io.DataType;
7-
import com.scalar.db.io.Value;
88
import java.util.Map;
99
import java.util.Properties;
1010
import java.util.Random;
@@ -41,26 +41,27 @@ protected Map<String, String> getCreationOptions() {
4141
}
4242

4343
@Override
44-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
44+
protected Column<?> getColumnWithRandomValue(
45+
Random random, String columnName, DataType dataType) {
4546
if (dataType == DataType.DOUBLE) {
4647
return DynamoTestUtils.getRandomDynamoDoubleValue(random, columnName);
4748
}
48-
return super.getRandomValue(random, columnName, dataType);
49+
return super.getColumnWithRandomValue(random, columnName, dataType);
4950
}
5051

5152
@Override
52-
protected Value<?> getMinValue(String columnName, DataType dataType) {
53+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
5354
if (dataType == DataType.DOUBLE) {
5455
return DynamoTestUtils.getMinDynamoDoubleValue(columnName);
5556
}
56-
return super.getMinValue(columnName, dataType);
57+
return super.getColumnWithMinValue(columnName, dataType);
5758
}
5859

5960
@Override
60-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
61+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
6162
if (dataType == DataType.DOUBLE) {
6263
return DynamoTestUtils.getMaxDynamoDoubleValue(columnName);
6364
}
64-
return super.getMaxValue(columnName, dataType);
65+
return super.getColumnWithMaxValue(columnName, dataType);
6566
}
6667
}

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoMultiplePartitionKeyIntegrationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
import com.google.common.collect.ArrayListMultimap;
44
import com.google.common.collect.ListMultimap;
55
import com.scalar.db.api.DistributedStorageMultiplePartitionKeyIntegrationTestBase;
6+
import com.scalar.db.io.Column;
67
import com.scalar.db.io.DataType;
7-
import com.scalar.db.io.Value;
88
import java.util.Map;
99
import java.util.Properties;
1010
import java.util.Random;
@@ -37,26 +37,27 @@ protected ListMultimap<DataType, DataType> getPartitionKeyTypes() {
3737
}
3838

3939
@Override
40-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
40+
protected Column<?> getColumnWithRandomValue(
41+
Random random, String columnName, DataType dataType) {
4142
if (dataType == DataType.DOUBLE) {
4243
return DynamoTestUtils.getRandomDynamoDoubleValue(random, columnName);
4344
}
44-
return super.getRandomValue(random, columnName, dataType);
45+
return super.getColumnWithRandomValue(random, columnName, dataType);
4546
}
4647

4748
@Override
48-
protected Value<?> getMinValue(String columnName, DataType dataType) {
49+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
4950
if (dataType == DataType.DOUBLE) {
5051
return DynamoTestUtils.getMinDynamoDoubleValue(columnName);
5152
}
52-
return super.getMinValue(columnName, dataType);
53+
return super.getColumnWithMinValue(columnName, dataType);
5354
}
5455

5556
@Override
56-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
57+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
5758
if (dataType == DataType.DOUBLE) {
5859
return DynamoTestUtils.getMaxDynamoDoubleValue(columnName);
5960
}
60-
return super.getMaxValue(columnName, dataType);
61+
return super.getColumnWithMaxValue(columnName, dataType);
6162
}
6263
}

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoSecondaryIndexIntegrationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.scalar.db.storage.dynamo;
22

33
import com.scalar.db.api.DistributedStorageSecondaryIndexIntegrationTestBase;
4+
import com.scalar.db.io.Column;
45
import com.scalar.db.io.DataType;
5-
import com.scalar.db.io.Value;
66
import com.scalar.db.util.TestUtils;
77
import java.util.HashSet;
88
import java.util.Map;
@@ -36,28 +36,29 @@ protected Map<String, String> getCreationOptions() {
3636
}
3737

3838
@Override
39-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
39+
protected Column<?> getColumnWithRandomValue(
40+
Random random, String columnName, DataType dataType) {
4041
if (dataType == DataType.DOUBLE) {
4142
return DynamoTestUtils.getRandomDynamoDoubleValue(random, columnName);
4243
}
4344
// don't allow empty value since secondary index cannot contain empty value
44-
return TestUtils.getRandomValue(random, columnName, dataType, false);
45+
return TestUtils.getColumnWithRandomValue(random, columnName, dataType, false);
4546
}
4647

4748
@Override
48-
protected Value<?> getMinValue(String columnName, DataType dataType) {
49+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
4950
if (dataType == DataType.DOUBLE) {
5051
return DynamoTestUtils.getMinDynamoDoubleValue(columnName);
5152
}
5253
// don't allow empty value since secondary index cannot contain empty value
53-
return TestUtils.getMinValue(columnName, dataType, false);
54+
return TestUtils.getColumnWithMinValue(columnName, dataType, false);
5455
}
5556

5657
@Override
57-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
58+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
5859
if (dataType == DataType.DOUBLE) {
5960
return DynamoTestUtils.getMaxDynamoDoubleValue(columnName);
6061
}
61-
return super.getMaxValue(columnName, dataType);
62+
return super.getColumnWithMaxValue(columnName, dataType);
6263
}
6364
}

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoSingleClusteringKeyScanIntegrationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.scalar.db.storage.dynamo;
22

33
import com.scalar.db.api.DistributedStorageSingleClusteringKeyScanIntegrationTestBase;
4+
import com.scalar.db.io.Column;
45
import com.scalar.db.io.DataType;
5-
import com.scalar.db.io.Value;
66
import java.util.HashSet;
77
import java.util.Map;
88
import java.util.Properties;
@@ -36,26 +36,27 @@ protected Map<String, String> getCreationOptions() {
3636
}
3737

3838
@Override
39-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
39+
protected Column<?> getColumnWithRandomValue(
40+
Random random, String columnName, DataType dataType) {
4041
if (dataType == DataType.DOUBLE) {
4142
return DynamoTestUtils.getRandomDynamoDoubleValue(random, columnName);
4243
}
43-
return super.getRandomValue(random, columnName, dataType);
44+
return super.getColumnWithRandomValue(random, columnName, dataType);
4445
}
4546

4647
@Override
47-
protected Value<?> getMinValue(String columnName, DataType dataType) {
48+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
4849
if (dataType == DataType.DOUBLE) {
4950
return DynamoTestUtils.getMinDynamoDoubleValue(columnName);
5051
}
51-
return super.getMinValue(columnName, dataType);
52+
return super.getColumnWithMinValue(columnName, dataType);
5253
}
5354

5455
@Override
55-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
56+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
5657
if (dataType == DataType.DOUBLE) {
5758
return DynamoTestUtils.getMaxDynamoDoubleValue(columnName);
5859
}
59-
return super.getMaxValue(columnName, dataType);
60+
return super.getColumnWithMaxValue(columnName, dataType);
6061
}
6162
}

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoSinglePartitionKeyIntegrationTest.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.scalar.db.storage.dynamo;
22

33
import com.scalar.db.api.DistributedStorageSinglePartitionKeyIntegrationTestBase;
4+
import com.scalar.db.io.Column;
45
import com.scalar.db.io.DataType;
5-
import com.scalar.db.io.Value;
66
import java.util.Map;
77
import java.util.Properties;
88
import java.util.Random;
@@ -20,26 +20,27 @@ protected Map<String, String> getCreationOptions() {
2020
}
2121

2222
@Override
23-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
23+
protected Column<?> getColumnWithRandomValue(
24+
Random random, String columnName, DataType dataType) {
2425
if (dataType == DataType.DOUBLE) {
2526
return DynamoTestUtils.getRandomDynamoDoubleValue(random, columnName);
2627
}
27-
return super.getRandomValue(random, columnName, dataType);
28+
return super.getColumnWithRandomValue(random, columnName, dataType);
2829
}
2930

3031
@Override
31-
protected Value<?> getMinValue(String columnName, DataType dataType) {
32+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
3233
if (dataType == DataType.DOUBLE) {
3334
return DynamoTestUtils.getMinDynamoDoubleValue(columnName);
3435
}
35-
return super.getMinValue(columnName, dataType);
36+
return super.getColumnWithMinValue(columnName, dataType);
3637
}
3738

3839
@Override
39-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
40+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
4041
if (dataType == DataType.DOUBLE) {
4142
return DynamoTestUtils.getMaxDynamoDoubleValue(columnName);
4243
}
43-
return super.getMaxValue(columnName, dataType);
44+
return super.getColumnWithMaxValue(columnName, dataType);
4445
}
4546
}

‎core/src/integration-test/java/com/scalar/db/storage/dynamo/DynamoTestUtils.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package com.scalar.db.storage.dynamo;
22

33
import com.scalar.db.io.DoubleColumn;
4-
import com.scalar.db.io.DoubleValue;
54
import java.util.Random;
65

76
public final class DynamoTestUtils {
@@ -11,8 +10,8 @@ public final class DynamoTestUtils {
1110

1211
private DynamoTestUtils() {}
1312

14-
public static DoubleValue getRandomDynamoDoubleValue(Random random, String columnName) {
15-
return new DoubleValue(columnName, nextDynamoDouble(random));
13+
public static DoubleColumn getRandomDynamoDoubleValue(Random random, String columnName) {
14+
return DoubleColumn.of(columnName, nextDynamoDouble(random));
1615
}
1716

1817
public static DoubleColumn getRandomDynamoDoubleColumn(Random random, String columnName) {
@@ -27,11 +26,11 @@ public static double nextDynamoDouble(Random random) {
2726
.orElse(0.0d);
2827
}
2928

30-
public static DoubleValue getMinDynamoDoubleValue(String columnName) {
31-
return new DoubleValue(columnName, MIN_DYNAMO_DOUBLE_VALUE);
29+
public static DoubleColumn getMinDynamoDoubleValue(String columnName) {
30+
return DoubleColumn.of(columnName, MIN_DYNAMO_DOUBLE_VALUE);
3231
}
3332

34-
public static DoubleValue getMaxDynamoDoubleValue(String columnName) {
35-
return new DoubleValue(columnName, MAX_DYNAMO_DOUBLE_VALUE);
33+
public static DoubleColumn getMaxDynamoDoubleValue(String columnName) {
34+
return DoubleColumn.of(columnName, MAX_DYNAMO_DOUBLE_VALUE);
3635
}
3736
}

‎core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseColumnValueIntegrationTest.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import com.scalar.db.api.DistributedStorageColumnValueIntegrationTestBase;
44
import com.scalar.db.config.DatabaseConfig;
5+
import com.scalar.db.io.Column;
56
import com.scalar.db.io.DataType;
6-
import com.scalar.db.io.Value;
77
import com.scalar.db.util.TestUtils;
88
import java.util.Properties;
99
import java.util.Random;
@@ -22,31 +22,32 @@ protected Properties getProperties(String testName) {
2222
}
2323

2424
@Override
25-
protected Value<?> getRandomValue(Random random, String columnName, DataType dataType) {
25+
protected Column<?> getColumnWithRandomValue(
26+
Random random, String columnName, DataType dataType) {
2627
if (JdbcTestUtils.isOracle(rdbEngine)) {
2728
if (dataType == DataType.DOUBLE) {
2829
return JdbcTestUtils.getRandomOracleDoubleValue(random, columnName);
2930
}
3031
// don't allow empty value since Oracle treats empty value as NULL
31-
return TestUtils.getRandomValue(random, columnName, dataType, false);
32+
return TestUtils.getColumnWithRandomValue(random, columnName, dataType, false);
3233
}
33-
return super.getRandomValue(random, columnName, dataType);
34+
return super.getColumnWithRandomValue(random, columnName, dataType);
3435
}
3536

3637
@Override
37-
protected Value<?> getMinValue(String columnName, DataType dataType) {
38+
protected Column<?> getColumnWithMinValue(String columnName, DataType dataType) {
3839
if (JdbcTestUtils.isOracle(rdbEngine)) {
3940
if (dataType == DataType.DOUBLE) {
4041
return JdbcTestUtils.getMinOracleDoubleValue(columnName);
4142
}
4243
// don't allow empty value since Oracle treats empty value as NULL
43-
return TestUtils.getMinValue(columnName, dataType, false);
44+
return TestUtils.getColumnWithMinValue(columnName, dataType, false);
4445
}
45-
return super.getMinValue(columnName, dataType);
46+
return super.getColumnWithMinValue(columnName, dataType);
4647
}
4748

4849
@Override
49-
protected Value<?> getMaxValue(String columnName, DataType dataType) {
50+
protected Column<?> getColumnWithMaxValue(String columnName, DataType dataType) {
5051
if (JdbcTestUtils.isOracle(rdbEngine)) {
5152
if (dataType == DataType.DOUBLE) {
5253
return JdbcTestUtils.getMaxOracleDoubleValue(columnName);
@@ -57,6 +58,6 @@ protected Value<?> getMaxValue(String columnName, DataType dataType) {
5758
return JdbcTestUtils.getMaxSqlServerTextValue(columnName);
5859
}
5960
}
60-
return super.getMaxValue(columnName, dataType);
61+
return super.getColumnWithMaxValue(columnName, dataType);
6162
}
6263
}

‎core/src/integration-test/java/com/scalar/db/storage/jdbc/JdbcDatabaseCrossPartitionScanIntegrationTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
import com.scalar.db.config.DatabaseConfig;
55
import com.scalar.db.io.Column;
66
import com.scalar.db.io.DataType;
7-
import com.scalar.db.util.ScalarDbUtils;
87
import java.util.Properties;
98
import java.util.Random;
109

@@ -33,7 +32,7 @@ protected int getThreadNum() {
3332
protected Column<?> getRandomColumn(Random random, String columnName, DataType dataType) {
3433
if (JdbcTestUtils.isOracle(rdbEngine)) {
3534
if (dataType == DataType.DOUBLE) {
36-
return ScalarDbUtils.toColumn(JdbcTestUtils.getRandomOracleDoubleValue(random, columnName));
35+
return JdbcTestUtils.getRandomOracleDoubleValue(random, columnName);
3736
}
3837
}
3938
return super.getRandomColumn(random, columnName, dataType);

0 commit comments

Comments
 (0)