Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FMWK-288 Fix secondary index mixup from adjacent tables #54

Merged
merged 1 commit into from
Dec 17, 2023
Merged

FMWK-288 Fix secondary index mixup from adjacent tables #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/com/aerospike/jdbc/AerospikeConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,8 +331,8 @@ public Struct createStruct(String typeName, Object[] attributes) throws SQLExcep
}

@Override
public String getSchema() throws SQLException {
return schema.get();
public String getSchema() {
return null;
}

@Override
Expand Down
69 changes: 30 additions & 39 deletions src/main/java/com/aerospike/jdbc/AerospikeDatabaseMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@
import java.util.*;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutionException;
import java.util.function.Function;
import java.util.logging.Logger;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -55,10 +54,10 @@ public class AerospikeDatabaseMetadata implements DatabaseMetaData, SimpleWrappe
private final Connection connection;
private final String dbBuild;
private final String dbEdition;

private final List<String> catalogs;
private final Map<String, Collection<String>> tables;
private final Map<String, Collection<AerospikeSecondaryIndex>> catalogIndexes;
private final Map<String, AerospikeSecondaryIndex> secondaryIndexes;
private final AerospikeSchemaBuilder schemaBuilder;
private final Cache<String, ResultSetMetaData> resultSetMetaDataCache;

Expand Down Expand Up @@ -102,9 +101,6 @@ public AerospikeDatabaseMetadata(String url, IAerospikeClient client, AerospikeC
);
});
});
secondaryIndexes = catalogIndexes.values().stream()
.flatMap(Collection::stream)
.collect(Collectors.toMap(AerospikeSecondaryIndex::toKey, Function.identity()));

schemaBuilder = new AerospikeSchemaBuilder(client, connection.getConfiguration().getDriverPolicy());
resultSetMetaDataCache = CacheBuilder.newBuilder().build();
Expand Down Expand Up @@ -763,7 +759,7 @@ public ResultSet getTables(String catalog, String schemaPattern, String tableNam
public ResultSet getSchemas() {
return new ListRecordSet(null, "system", "schemas",
systemColumns(new String[]{"TABLE_SCHEM", "TABLE_CATALOG"}, new int[]{VARCHAR, VARCHAR}),
catalogs.stream().map(ns -> Arrays.asList(ns, ns)).collect(toList()));
catalogs.stream().map(ns -> Arrays.asList("", ns)).collect(toList()));
}

@Override
Expand All @@ -783,28 +779,27 @@ public ResultSet getTableTypes() {
@Override
public ResultSet getColumns(String catalog, String schemaPattern, String tableNamePattern,
String columnNamePattern) throws SQLException {
logger.info(() -> format("AerospikeDatabaseMetadata getColumns; %s, %s, %s, %s", catalog,
schemaPattern, tableNamePattern, columnNamePattern));
logger.info(() -> format("getColumns: %s, %s, %s, %s", catalog, schemaPattern, tableNamePattern,
columnNamePattern));
Pattern tableNameRegex = isNullOrEmpty(tableNamePattern) ? null
: Pattern.compile(tableNamePattern.replace("%", ".*"));

final String namespace = catalog == null ? schemaPattern : catalog;
final List<ResultSetMetaData> mds;
if (namespace == null) {
mds = tables.entrySet().stream()
final List<ResultSetMetaData> resultSetMetaDataList;
if (catalog == null) {
resultSetMetaDataList = tables.entrySet().stream()
.flatMap(p -> p.getValue().stream().map(t -> getMetadata(p.getKey(), t)))
.collect(toList());
} else {
mds = tables.getOrDefault(namespace, Collections.emptyList()).stream()
resultSetMetaDataList = tables.getOrDefault(catalog, Collections.emptyList()).stream()
.filter(t -> tableNameRegex == null || tableNameRegex.matcher(t).matches())
.map(t -> getMetadata(namespace, t))
.map(t -> getMetadata(catalog, t))
.collect(toList());
}

List<List<?>> result = new ArrayList<>();
for (ResultSetMetaData md : mds) {
int n = md.getColumnCount();
for (int i = 1; i <= n; i++) {
for (ResultSetMetaData md : resultSetMetaDataList) {
int columnCount = md.getColumnCount();
for (int i = 1; i <= columnCount; i++) {
result.add(asList("".equals(tableNamePattern) ? "" : md.getCatalogName(i), null,
md.getTableName(1), md.getColumnName(i), md.getColumnType(i), md.getColumnTypeName(i),
0, 0, 0, 0, columnNullable, null, null, md.getColumnType(i), 0,
Expand Down Expand Up @@ -963,14 +958,17 @@ public ResultSet getTypeInfo() {

@Override
public ResultSet getIndexInfo(String catalog, String schema, String table, boolean unique, boolean approximate) {
logger.info(() -> format("getIndexInfo: %s, %s, %s", catalog, schema, table));
Stream<AerospikeSecondaryIndex> secondaryIndexStream;
if (catalog == null) {
secondaryIndexStream = catalogIndexes.entrySet().stream().flatMap(p -> p.getValue().stream());
secondaryIndexStream = catalogIndexes.entrySet().stream()
.flatMap(p -> p.getValue().stream());
} else {
secondaryIndexStream = getOrDefault(catalogIndexes, catalog, Collections.emptyList()).stream();
secondaryIndexStream = getOrDefault(catalogIndexes, catalog, Collections.emptyList()).stream()
.filter(i -> i.getNamespace().equals(catalog));
}
final Iterable<List<?>> indicesData = secondaryIndexStream
.filter(i -> i.getNamespace().equals(schema) && i.getSet().equals(table))
final Iterable<List<?>> indexData = secondaryIndexStream
.filter(i -> i.getSet().equals(table))
.map(this::indexInfoAsList)
.collect(Collectors.toList());

Expand All @@ -982,11 +980,11 @@ public ResultSet getIndexInfo(String catalog, String schema, String table, boole
VARCHAR, BIGINT, BIGINT, VARCHAR};

return new ListRecordSet(null, "system", "index_info",
systemColumns(columns, sqlTypes), indicesData);
systemColumns(columns, sqlTypes), indexData);
}

public Map<String, AerospikeSecondaryIndex> getSecondaryIndexes() {
return secondaryIndexes;
public Collection<AerospikeSecondaryIndex> getSecondaryIndexes(String catalog) {
return catalogIndexes.get(catalog);
}

@Override
Expand Down Expand Up @@ -1085,18 +1083,16 @@ public boolean supportsGetGeneratedKeys() {

@Override
public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern) {
List<List<?>> types = asList(
asList(catalog, null, "list", null, null, Object.class.getName()),
asList(catalog, null, "map", null, null, Object.class.getName()),
asList(catalog, null, "GeoJSON", null, null, Object.class.getName())
);
List<List<?>> typeNames = Stream.of("List", "Map", "GeoJSON")
.map(typeName -> asList(catalog, null, typeName, null, null, Object.class.getName()))
.collect(toList());

String[] columns = new String[]{"TYPE_CAT", "TYPE_SCHEM", "TYPE_NAME", "SUPERTYPE_CAT", "SUPERTYPE_SCHEM",
"SUPERTYPE_NAME"};
int[] sqlTypes = new int[]{VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR, VARCHAR};

return new ListRecordSet(null, "system", "super_types",
systemColumns(columns, sqlTypes), types);
systemColumns(columns, sqlTypes), typeNames);
}

@Override
Expand Down Expand Up @@ -1203,24 +1199,19 @@ public boolean autoCommitFailureClosesAllResultSets() {

@Override
public ResultSet getClientInfoProperties() {
// TODO: add properties here once implemented
String[] columns = new String[]{"NAME", "MAX_LEN", "DEFAULT_VALUE", "DESCRIPTION"};
int[] sqlTypes = new int[]{VARCHAR, INTEGER, VARCHAR, VARCHAR};
return new ListRecordSet(null, "system", "client_inf_properties",
return new ListRecordSet(null, "system", "client_info_properties",
systemColumns(columns, sqlTypes), emptyList());
}

@Override
public ResultSet getFunctions(String catalog, String schemaPattern, String functionNamePattern) {
//TODO: implement functions support
List<List<?>> functions = new ArrayList<>();

String[] columns = new String[]{"FUNCTION_CAT", "FUNCTION_SCHEM", "FUNCTION_NAME", "REMARKS",
"FUNCTION_TYPE", "SPECIFIC_NAME"};

int[] sqlTypes = new int[]{VARCHAR, VARCHAR, VARCHAR, VARCHAR, SMALLINT, VARCHAR};
return new ListRecordSet(null, "system", "functions",
systemColumns(columns, sqlTypes), functions);
systemColumns(columns, sqlTypes), emptyList());
}

@Override
Expand Down Expand Up @@ -1295,8 +1286,8 @@ private String join(String defaultValue, String delimiter, Collection<String> el
private int ordinal(ResultSetMetaData md, String columnName) {
int ordinal = 0;
try {
int n = md.getColumnCount();
for (int i = 1; i <= n; i++) {
int columnCount = md.getColumnCount();
for (int i = 1; i <= columnCount; i++) {
if (columnName.equals(md.getColumnName(i))) {
ordinal = i;
break;
Expand Down
6 changes: 1 addition & 5 deletions src/main/java/com/aerospike/jdbc/AerospikeStatement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,7 @@ public class AerospikeStatement implements Statement, SimpleWrapper {
public AerospikeStatement(IAerospikeClient client, AerospikeConnection connection) {
this.client = client;
this.connection = connection;
try {
this.schema = connection.getSchema();
} catch (SQLException e) {
logger.warning(e.getMessage());
}
this.schema = connection.getCatalog();
}

@Override
Expand Down
13 changes: 6 additions & 7 deletions src/main/java/com/aerospike/jdbc/model/AerospikeSecondaryIndex.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,16 @@ public String getSet() {
return set;
}

public Integer getBinValuesRatio()
{
public Integer getBinValuesRatio() {
return binValuesRatio;
}

public String toKey() {
return key(namespace, set, indexName);
return key(namespace, set, binName);
}

public static String key(String namespace, String set, String indexName) {
return String.format("%s/%s/%s", namespace, set, indexName);
public static String key(String namespace, String set, String binName) {
return String.format("%s.%s.%s", namespace, set, binName);
}

@SuppressWarnings("all")
Expand Down Expand Up @@ -149,7 +148,7 @@ public int hashCode() {

@Override
public String toString() {
return getClass().getSimpleName() + "(" + binName + ", " + indexName + ", " + indexType +
", " + namespace + ", " + set + ")";
return String.format("%s(%s, %s, %s, %s, %s)", getClass().getSimpleName(),
binName, indexName, indexType, namespace, set);
}
}
40 changes: 19 additions & 21 deletions src/main/java/com/aerospike/jdbc/query/SelectQueryHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,12 @@
import java.sql.SQLException;
import java.sql.Statement;
import java.sql.Types;
import java.util.*;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Logger;
import java.util.stream.Collectors;
Expand Down Expand Up @@ -130,23 +135,17 @@ private Pair<ResultSet, Integer> executeQuery(AerospikeQuery query,

private Optional<AerospikeSecondaryIndex> secondaryIndex(AerospikeQuery query) {
if (aerospikeVersion.isSIndexSupported() && query.isIndexable()) {
Map<String, AerospikeSecondaryIndex> indexMap = databaseMetadata.getSecondaryIndexes();
Collection<AerospikeSecondaryIndex> indexes = databaseMetadata.getSecondaryIndexes(query.getSchema());
List<String> binNames = query.getPredicate().getBinNames();
if (!binNames.isEmpty() && indexMap != null && !indexMap.isEmpty()) {
if (binNames.size() == 1) {
String binName = binNames.get(0);
for (AerospikeSecondaryIndex index : indexMap.values()) {
if (index.getBinName().equals(binName)) {
return Optional.of(index);
}
}
} else {
List<AerospikeSecondaryIndex> indexList = new ArrayList<>(indexMap.values());
sortIndexList(indexList);
for (AerospikeSecondaryIndex index : indexList) {
if (binNames.contains(index.getBinName())) {
return Optional.of(index);
}
if (!binNames.isEmpty() && indexes != null && !indexes.isEmpty()) {
List<AerospikeSecondaryIndex> indexList = indexes.stream()
.filter(i -> i.getSet().equals(query.getTable()))
.sorted(secondaryIndexComparator())
.collect(Collectors.toList());

for (AerospikeSecondaryIndex index : indexList) {
if (binNames.contains(index.getBinName())) {
return Optional.of(index);
}
}
}
Expand All @@ -159,12 +158,11 @@ private Pair<ResultSet, Integer> queryResult(RecordSet recordSet, AerospikeQuery
query.getTable(), filterColumns(query)), -1);
}

private void sortIndexList(List<AerospikeSecondaryIndex> indexList) {
private Comparator<AerospikeSecondaryIndex> secondaryIndexComparator() {
if (aerospikeVersion.isSIndexCardinalitySupported()) {
indexList.sort(Comparator.comparingInt(AerospikeSecondaryIndex::getBinValuesRatio));
} else {
indexList.sort(Comparator.comparing(AerospikeSecondaryIndex::getBinName));
return Comparator.comparingInt(AerospikeSecondaryIndex::getBinValuesRatio);
}
return Comparator.comparing(AerospikeSecondaryIndex::getBinName);
}

private List<DataColumn> filterColumns(AerospikeQuery query) {
Expand Down
5 changes: 3 additions & 2 deletions src/main/java/com/aerospike/jdbc/sql/AerospikeResultSetMetaData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ public String getColumnName(int column) throws SQLException {
@Override
public String getSchemaName(int column) throws SQLException {
validateColumn(column);
return schema;
return "";
}

@Override
Expand All @@ -166,7 +166,8 @@ public String getTableName(int column) throws SQLException {

@Override
public String getCatalogName(int column) throws SQLException {
return getSchemaName(column); // return schema
validateColumn(column);
return schema;
}

@Override
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/com/aerospike/jdbc/DatabaseMetadataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@ public void testGetSchemas() throws SQLException {

assertTrue(schemas.next());
String schemaName = schemas.getString(1);
String catalogName = schemas.getString(2);
assertEquals(schemas.getString("TABLE_SCHEM"), schemaName);
assertEquals(schemas.getString("TABLE_CATALOG"), schemaName);
assertEquals(schemas.getString(2), schemaName);
assertEquals(schemas.getString("TABLE_CATALOG"), catalogName);
assertFalse(schemas.next());
TestUtil.closeQuietly(schemas);
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/aerospike/jdbc/PreparedQueriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ public void setUp() throws SQLException {
public void tearDown() throws SQLException {
Objects.requireNonNull(connection, "connection is null");
PreparedStatement statement = null;
ResultSet resultSet = null;
String query = format("delete from %s", tableName);
try {
statement = connection.prepareStatement(query);
boolean result = statement.execute();
assertFalse(result);
} finally {
closeQuietly(statement);
closeQuietly(resultSet);
}
assertTrue(statement.getUpdateCount() > 0);
}
Expand Down
2 changes: 0 additions & 2 deletions src/test/java/com/aerospike/jdbc/SimpleQueriesTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ public void setUp() throws SQLException {
public void tearDown() throws SQLException {
Objects.requireNonNull(connection, "connection is null");
Statement statement = null;
ResultSet resultSet = null;
String query = format("DELETE FROM %s", tableName);
try {
statement = connection.createStatement();
boolean result = statement.execute(query);
assertFalse(result);
} finally {
closeQuietly(statement);
closeQuietly(resultSet);
}
assertTrue(statement.getUpdateCount() > 0);
}
Expand Down
Loading