Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,6 @@
* Transaction read query strategy.
*/
public enum TransactionReadQueryStrategy {

FIXED_PRIMARY, FIXED_REPLICA, DYNAMIC_REPLICA
}
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,7 @@ public final class RandomReadQueryLoadBalanceAlgorithm implements ReadQueryLoadB

@Override
public void init(final Properties props) {
transactionReadQueryStrategy = props.containsKey(TRANSACTION_READ_QUERY_STRATEGY)
? TransactionReadQueryStrategy.valueOf(props.getProperty(TRANSACTION_READ_QUERY_STRATEGY))
: TransactionReadQueryStrategy.FIXED_PRIMARY;
transactionReadQueryStrategy = TransactionReadQueryStrategy.valueOf(props.getProperty(TRANSACTION_READ_QUERY_STRATEGY, TransactionReadQueryStrategy.FIXED_PRIMARY.name()));
}

@Override
Expand All @@ -50,12 +48,12 @@ public String getDataSource(final String name, final String writeDataSourceName,
}

@Override
public String getType() {
return "RANDOM";
public String getDataSourceName(final String name, final List<String> readDataSourceNames) {
return readDataSourceNames.get(ThreadLocalRandom.current().nextInt(readDataSourceNames.size()));
}

@Override
public String getDataSourceName(final String name, final List<String> readDataSourceNames) {
return readDataSourceNames.get(ThreadLocalRandom.current().nextInt(readDataSourceNames.size()));
public String getType() {
return "RANDOM";
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,7 @@ public final class RoundRobinReadQueryLoadBalanceAlgorithm implements ReadQueryL

@Override
public void init(final Properties props) {
transactionReadQueryStrategy = props.containsKey(TRANSACTION_READ_QUERY_STRATEGY)
? TransactionReadQueryStrategy.valueOf(props.getProperty(TRANSACTION_READ_QUERY_STRATEGY))
: TransactionReadQueryStrategy.FIXED_PRIMARY;
transactionReadQueryStrategy = TransactionReadQueryStrategy.valueOf(props.getProperty(TRANSACTION_READ_QUERY_STRATEGY, TransactionReadQueryStrategy.FIXED_PRIMARY.name()));
}

@Override
Expand All @@ -51,6 +49,11 @@ public String getDataSource(final String name, final String writeDataSourceName,
return getDataSourceName(name, readDataSourceNames);
}

@Override
public String getDataSourceName(final String name, final List<String> readDataSourceNames) {
return readDataSourceNames.get(Math.abs(count.getAndIncrement()) % readDataSourceNames.size());
}

@Override
public String getType() {
return "ROUND_ROBIN";
Expand All @@ -60,9 +63,4 @@ public String getType() {
public boolean isDefault() {
return true;
}

@Override
public String getDataSourceName(final String name, final List<String> readDataSourceNames) {
return readDataSourceNames.get(Math.abs(count.getAndIncrement()) % readDataSourceNames.size());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,10 @@ public final class WeightReadQueryLoadBalanceAlgorithm implements ReadQueryLoadB
@Override
public void init(final Properties props) {
this.props = props;
if (props.containsKey(TRANSACTION_READ_QUERY_STRATEGY)) {
transactionReadQueryStrategy = TransactionReadQueryStrategy.valueOf(props.getProperty(TRANSACTION_READ_QUERY_STRATEGY));
dataSourceNames = props.stringPropertyNames().stream().filter(each -> !each.equals(TRANSACTION_READ_QUERY_STRATEGY)).collect(Collectors.toList());
} else {
transactionReadQueryStrategy = TransactionReadQueryStrategy.FIXED_PRIMARY;
dataSourceNames = props.stringPropertyNames();
}
transactionReadQueryStrategy = TransactionReadQueryStrategy.valueOf(props.getProperty(TRANSACTION_READ_QUERY_STRATEGY, TransactionReadQueryStrategy.FIXED_PRIMARY.name()));
dataSourceNames = props.containsKey(TRANSACTION_READ_QUERY_STRATEGY)
? props.stringPropertyNames().stream().filter(each -> !each.equals(TRANSACTION_READ_QUERY_STRATEGY)).collect(Collectors.toList())
: props.stringPropertyNames();
}

@Override
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.shardingsphere.readwritesplitting.transaction;

import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.apache.shardingsphere.infra.context.transaction.TransactionConnectionContext;
import org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionReadQueryStrategy;
import org.apache.shardingsphere.readwritesplitting.api.transaction.TransactionReadQueryStrategyAware;
Expand All @@ -26,7 +28,8 @@
/**
* Transaction read query strategy util.
*/
public class TransactionReadQueryStrategyUtil {
@NoArgsConstructor(access = AccessLevel.PRIVATE)
public final class TransactionReadQueryStrategyUtil {

/**
* Get data source name in transaction.
Expand Down