honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Make ShowColumns async (elastic/x-pack-elasticsearch#2638) 

Original commit: elastic/x-pack-elasticsearch@54214b1109
This commit is contained in:
Igor Motov 2017-09-28 14:22:22 -04:00 committed by GitHub
parent 6be886edd8
commit 33717f477f
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sql/server/src/main/java/org/elasticsearch/xpack/sql/plan/logical/command/ShowColumns.java
View File

@ -5,8 +5,8 @@
*/ */
package org.elasticsearch.xpack.sql.plan.logical.command; package org.elasticsearch.xpack.sql.plan.logical.command;
import org.elasticsearch.xpack.sql.SqlIllegalArgumentException; import org.elasticsearch.action.ActionListener;
import org.elasticsearch.xpack.sql.analysis.catalog.EsIndex; import org.elasticsearch.action.support.IndicesOptions;
import org.elasticsearch.xpack.sql.expression.Attribute; import org.elasticsearch.xpack.sql.expression.Attribute;
import org.elasticsearch.xpack.sql.expression.RootFieldAttribute; import org.elasticsearch.xpack.sql.expression.RootFieldAttribute;
import org.elasticsearch.xpack.sql.session.RowSet; import org.elasticsearch.xpack.sql.session.RowSet;
@ -40,23 +40,28 @@ public class ShowColumns extends Command {
@Override @Override
public List<Attribute> output() { public List<Attribute> output() {
return asList(new RootFieldAttribute(location(), "column", DataTypes.KEYWORD), return asList(new RootFieldAttribute(location(), "column", DataTypes.KEYWORD),
new RootFieldAttribute(location(), "type", DataTypes.KEYWORD)); new RootFieldAttribute(location(), "type", DataTypes.KEYWORD));
}
@Override
public void execute(SqlSession session, ActionListener<RowSet> listener) {
session.getIndices(new String[]{index}, IndicesOptions.strictExpandOpenAndForbidClosed(), ActionListener.wrap(
esIndices -> {
List<List<?>> rows = new ArrayList<>();
if (esIndices.isEmpty() == false) {
//TODO: we are using only the first index for now - add support for aliases
fillInRows(esIndices.get(0).mapping(), null, rows);
}
listener.onResponse(Rows.of(output(), rows));
},
listener::onFailure
));
} }
@Override @Override
protected RowSet execute(SqlSession session) { protected RowSet execute(SqlSession session) {
List<List<?>> rows = new ArrayList<>(); throw new UnsupportedOperationException("No synchronous exec");
EsIndex fetched;
try {
fetched = session.getIndexSync(index);
} catch (SqlIllegalArgumentException e) {
throw new IllegalArgumentException(e);
}
if (fetched != null) {
fillInRows(fetched.mapping(), null, rows);
}
return Rows.of(output(), rows);
} }
private void fillInRows(Map<String, DataType> mapping, String prefix, List<List<?>> rows) { private void fillInRows(Map<String, DataType> mapping, String prefix, List<List<?>> rows) {
@ -83,11 +88,11 @@ public class ShowColumns extends Command {
if (this == obj) { if (this == obj) {
return true; return true;
} }
if (obj == null || getClass() != obj.getClass()) { if (obj == null || getClass() != obj.getClass()) {
return false; return false;
} }
ShowColumns other = (ShowColumns) obj; ShowColumns other = (ShowColumns) obj;
return Objects.equals(index, other.index); return Objects.equals(index, other.index);
} }