support setting the default schema in the SQLRequest

crate · Apr 2, 2015 · 93ebc13 · 93ebc13
1 parent 5659580
commit 93ebc13
Show file tree

Hide file tree

Showing 15 changed files with 232 additions and 33 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -5,6 +5,8 @@ Changes for Crate
 Unreleased
 ==========
 
+ - Added support for setting the default schema name in the SQLRequest class
+
  - Fix: ip type conversion did not allow NULL values
 
  - Fix: Grouping or sorting on a dynamically created column of a partitioned

diff --git a/sql-parser/src/main/java/io/crate/sql/tree/DefaultTraversalVisitor.java b/sql-parser/src/main/java/io/crate/sql/tree/DefaultTraversalVisitor.java
@@ -428,12 +428,55 @@ public R visitUpdate(Update node, C context) {
         return null;
     }
 
+    @Override
+    public R visitDelete(Delete node, C context) {
+        process(node.getRelation(), context);
+        return null;
+    }
+
     @Override
     public R visitCopyFromStatement(CopyFromStatement node, C context) {
         process(node.table(), context);
         return null;
     }
 
+    @Override
+    public R visitCopyTo(CopyTo node, C context) {
+        process(node.table(), context);
+        return null;
+    }
+
+    @Override
+    public R visitAlterTable(AlterTable node, C context) {
+        process(node.table(), context);
+        return null;
+    }
+
+    @Override
+    public R visitInsertFromSubquery(InsertFromSubquery node, C context) {
+        process(node.table(), context);
+        process(node.subQuery(), context);
+        return null;
+    }
+
+    @Override
+    public R visitDropTable(DropTable node, C context) {
+        process(node.table(), context);
+        return super.visitDropTable(node, context);
+    }
+
+    @Override
+    public R visitCreateTable(CreateTable node, C context) {
+        process(node.name(), context);
+        return null;
+    }
+
+    @Override
+    public R visitRefreshStatement(RefreshStatement node, C context) {
+        process(node.table(), context);
+        return null;
+    }
+
     @Override
     public R visitMatchPredicate(MatchPredicate node, C context)
     {

diff --git a/sql-parser/src/main/java/io/crate/sql/tree/Table.java b/sql-parser/src/main/java/io/crate/sql/tree/Table.java
@@ -21,7 +21,7 @@
 
 package io.crate.sql.tree;
 
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
 import com.google.common.collect.ImmutableList;
 
 import javax.annotation.Nullable;
@@ -30,7 +30,7 @@
 public class Table
         extends QueryBody
 {
-    private final QualifiedName name;
+    private QualifiedName name;
     private final List<Assignment> partitionProperties;
 
     public Table(QualifiedName name)
@@ -41,7 +41,7 @@ public Table(QualifiedName name)
 
     public Table(QualifiedName name, @Nullable List<Assignment> partitionProperties) {
         this.name = name;
-        this.partitionProperties = Objects.firstNonNull(partitionProperties, ImmutableList.<Assignment>of());
+        this.partitionProperties = MoreObjects.firstNonNull(partitionProperties, ImmutableList.<Assignment>of());
     }
 
     public QualifiedName getName()
@@ -62,7 +62,7 @@ public <R, C> R accept(AstVisitor<R, C> visitor, C context)
     @Override
     public String toString()
     {
-        return Objects.toStringHelper(this)
+        return MoreObjects.toStringHelper(this)
                 .addValue(name)
                 .add("partitionProperties", partitionProperties)
                 .toString();
@@ -87,4 +87,8 @@ public int hashCode() {
         result = 31 * result + partitionProperties.hashCode();
         return result;
     }
+
+    public void setName(QualifiedName qualifiedName) {
+        name = qualifiedName;
+    }
 }
diff --git a/sql/src/main/java/io/crate/action/sql/SQLBaseRequest.java b/sql/src/main/java/io/crate/action/sql/SQLBaseRequest.java
@@ -26,6 +26,7 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 
+import javax.annotation.Nullable;
 import java.io.IOException;
 
 /**
@@ -100,6 +101,15 @@ public long creationTime() {
         return creationTime;
     }
 
+    public void setDefaultSchema(String schemaName) {
+        putHeader("_s", schemaName);
+    }
+
+    @Nullable
+    public String getDefaultSchema() {
+        return getHeader("_s");
+    }
+
     @Override
     public ActionRequestValidationException validate() {
         if (stmt == null) {

diff --git a/sql/src/main/java/io/crate/action/sql/TransportSQLAction.java b/sql/src/main/java/io/crate/action/sql/TransportSQLAction.java
@@ -69,7 +69,7 @@ protected TransportSQLAction(
 
     @Override
     public Analysis getAnalysis(Statement statement, SQLRequest request) {
-        return analyzer.analyze(statement, request.args(), SQLBulkRequest.EMPTY_BULK_ARGS);
+        return analyzer.analyze(statement, request.args(), SQLBulkRequest.EMPTY_BULK_ARGS, request.getDefaultSchema());
     }
 
     @Override

diff --git a/sql/src/main/java/io/crate/action/sql/TransportSQLBulkAction.java b/sql/src/main/java/io/crate/action/sql/TransportSQLBulkAction.java
@@ -64,7 +64,7 @@ public TransportSQLBulkAction(ClusterService clusterService,
 
     @Override
     public Analysis getAnalysis(Statement statement, SQLBulkRequest request) {
-        return analyzer.analyze(statement, SQLRequest.EMPTY_ARGS, request.bulkArgs());
+        return analyzer.analyze(statement, SQLRequest.EMPTY_ARGS, request.bulkArgs(), request.getDefaultSchema());
     }
 
     @Override

diff --git a/sql/src/main/java/io/crate/analyze/Analyzer.java b/sql/src/main/java/io/crate/analyze/Analyzer.java
@@ -23,30 +23,44 @@
 import io.crate.sql.tree.*;
 import org.elasticsearch.common.inject.Inject;
 
+import javax.annotation.Nullable;
+import java.util.Arrays;
+import java.util.List;
+
 public class Analyzer {
 
     private final AnalyzerDispatcher dispatcher;
-
-    private final static Object[] EMPTY_ARGS = new Object[0];
-    private final static Object[][] EMPTY_BULK_ARGS = new Object[0][];
+    private final static SchemaApplier SCHEMA_APPLIER = new SchemaApplier();
 
     @Inject
     public Analyzer(AnalyzerDispatcher dispatcher) {
         this.dispatcher = dispatcher;
     }
 
-    public Analysis analyze(Statement statement) {
-        return analyze(statement, EMPTY_ARGS, EMPTY_BULK_ARGS);
-    }
-
-    public Analysis analyze(Statement statement, Object[] parameters, Object[][] bulkParams) {
+    public Analysis analyze(Statement statement, Object[] parameters, Object[][] bulkParams, @Nullable String defaultSchema) {
+        if (defaultSchema != null) {
+            SCHEMA_APPLIER.process(statement, defaultSchema);
+        }
         Analysis analysis = new Analysis(new ParameterContext(parameters, bulkParams));
         AnalyzedStatement analyzedStatement = dispatcher.process(statement, analysis);
         assert analyzedStatement != null : "analyzed statement must not be null";
         analysis.analyzedStatement(analyzedStatement);
         return analysis;
     }
 
+    private static class SchemaApplier extends DefaultTraversalVisitor<Void, String> {
+
+        @Override
+        protected Void visitTable(Table node, String schemaName) {
+            QualifiedName name = node.getName();
+            List<String> parts = name.getParts();
+            if (parts.size() == 1) {
+                node.setName(new QualifiedName(Arrays.asList(schemaName, parts.get(0))));
+            }
+            return null;
+        }
+    }
+
     public static class AnalyzerDispatcher extends AstVisitor<AnalyzedStatement, Analysis> {
 
         private final DropTableStatementAnalyzer dropTableStatementAnalyzer;

diff --git a/sql/src/main/java/io/crate/analyze/relations/QueriedRelation.java b/sql/src/main/java/io/crate/analyze/relations/QueriedRelation.java
@@ -25,6 +25,5 @@
 
 public interface QueriedRelation extends AnalyzedRelation {
 
-    public QuerySpec querySpec();
-
+    QuerySpec querySpec();
 }
diff --git a/sql/src/test/java/io/crate/analyze/BaseAnalyzerTest.java b/sql/src/test/java/io/crate/analyze/BaseAnalyzerTest.java
@@ -305,16 +305,17 @@ public Symbol normalizeSymbol(Function symbol) {
     }
 
     protected AnalyzedStatement analyze(String statement) {
-        return analyzer.analyze(SqlParser.createStatement(statement)).analyzedStatement();
+        return analyze(statement, new Object[0]);
     }
 
     protected AnalyzedStatement analyze(String statement, Object[] params) {
-        AnalyzedStatement stmt = analyzer.analyze(SqlParser.createStatement(statement), params, new Object[0][]).analyzedStatement();
-        return stmt;
+        return analyzer.analyze(SqlParser.createStatement(statement),
+                params, new Object[0][], ReferenceInfos.DEFAULT_SCHEMA_NAME).analyzedStatement();
     }
 
     protected AnalyzedStatement analyze(String statement, Object[][] bulkArgs) {
-        return analyzer.analyze(SqlParser.createStatement(statement), new Object[0], bulkArgs).analyzedStatement();
+        return analyzer.analyze(SqlParser.createStatement(statement),
+                new Object[0], bulkArgs, ReferenceInfos.DEFAULT_SCHEMA_NAME).analyzedStatement();
     }
 
     protected List<Module> getModules() {

diff --git a/sql/src/test/java/io/crate/analyze/CreateAlterTableStatementAnalyzerTest.java b/sql/src/test/java/io/crate/analyze/CreateAlterTableStatementAnalyzerTest.java
@@ -32,6 +32,7 @@
 import io.crate.metadata.table.ColumnPolicy;
 import io.crate.metadata.table.SchemaInfo;
 import io.crate.operation.operator.OperatorModule;
+import io.crate.sql.parser.SqlParser;
 import io.crate.testing.MockedClusterServiceModule;
 import org.elasticsearch.common.inject.Module;
 import org.elasticsearch.common.settings.ImmutableSettings;
@@ -277,7 +278,7 @@ public void testCreateTableWithArray() throws Exception {
 
         assertThat((String)details.get("type"), is("array"));
         Map<String, Object> inner = (Map<String, Object>)details.get("inner");
-        assertThat((String)inner.get("type"), is("string"));
+        assertThat((String) inner.get("type"), is("string"));
     }
 
     @Test
@@ -640,4 +641,23 @@ public void testCreateTableWithInvalidColumnName() throws Exception {
         expectedException.expectMessage("column name \"'test\" is invalid");
         analyze("create table my_table (\"'test\" string)");
     }
+
+    @Test
+    public void testExplicitSchemaHasPrecedenceOverDefaultSchema() throws Exception {
+        CreateTableAnalyzedStatement statement = (CreateTableAnalyzedStatement) analyzer.analyze(
+                SqlParser.createStatement("create table foo.bar (x string)"),
+                new Object[0], new Object[0][], "hoschi").analyzedStatement();
+
+        // schema from statement must take precedence
+        assertThat(statement.tableIdent.schema(), is("foo"));
+    }
+
+    @Test
+    public void testDefaultSchemaIsAddedToTableIdentIfNoEplicitSchemaExistsInTheStatement() throws Exception {
+        CreateTableAnalyzedStatement statement = (CreateTableAnalyzedStatement) analyzer.analyze(
+                SqlParser.createStatement("create table bar (x string)"),
+                new Object[0], new Object[0][], "hoschi").analyzedStatement();
+
+        assertThat(statement.tableIdent.schema(), is("hoschi"));
+    }
 }
diff --git a/sql/src/test/java/io/crate/analyze/UpdateAnalyzerTest.java b/sql/src/test/java/io/crate/analyze/UpdateAnalyzerTest.java
@@ -114,20 +114,23 @@ protected List<Module> getModules() {
     }
 
     protected UpdateAnalyzedStatement analyze(String statement) {
-        return ((UpdateAnalyzedStatement) analyzer.analyze(SqlParser.createStatement(statement)).analyzedStatement());
+        return analyze(statement, new Object[0]);
     }
 
     protected UpdateAnalyzedStatement analyze(String statement, Object[] params) {
-        return ((UpdateAnalyzedStatement) analyzer.analyze(
-                SqlParser.createStatement(statement),
+        return (UpdateAnalyzedStatement) analyzer.analyze(SqlParser.createStatement(statement),
                 params,
-                new Object[0][]).analyzedStatement());
+                new Object[0][],
+                ReferenceInfos.DEFAULT_SCHEMA_NAME
+        ).analyzedStatement();
     }
 
     protected UpdateAnalyzedStatement analyze(String statement, Object[][] bulkArgs) {
         return (UpdateAnalyzedStatement) analyzer.analyze(SqlParser.createStatement(statement),
                 new Object[0],
-                bulkArgs).analyzedStatement();
+                bulkArgs,
+                ReferenceInfos.DEFAULT_SCHEMA_NAME
+        ).analyzedStatement();
     }
 
     @Test

diff --git a/sql/src/test/java/io/crate/analyze/where/WhereClauseAnalyzerTest.java b/sql/src/test/java/io/crate/analyze/where/WhereClauseAnalyzerTest.java
@@ -160,7 +160,8 @@ protected void bindSchemas() {
     }
 
     private DeleteAnalyzedStatement analyzeDelete(String stmt, Object[][] bulkArgs) {
-        return (DeleteAnalyzedStatement) analyzer.analyze(SqlParser.createStatement(stmt), new Object[0], bulkArgs).analyzedStatement();
+        return (DeleteAnalyzedStatement) analyzer.analyze(SqlParser.createStatement(stmt),
+                new Object[0], bulkArgs, ReferenceInfos.DEFAULT_SCHEMA_NAME).analyzedStatement();
     }
 
     private DeleteAnalyzedStatement analyzeDelete(String stmt) {
@@ -169,12 +170,12 @@ private DeleteAnalyzedStatement analyzeDelete(String stmt) {
 
     private UpdateAnalyzedStatement analyzeUpdate(String stmt) {
         return (UpdateAnalyzedStatement) analyzer.analyze(
-                SqlParser.createStatement(stmt), new Object[0], new Object[0][]).analyzedStatement();
+                SqlParser.createStatement(stmt), new Object[0], new Object[0][], ReferenceInfos.DEFAULT_SCHEMA_NAME).analyzedStatement();
     }
 
     private WhereClause analyzeSelect(String stmt, Object... args) {
         SelectAnalyzedStatement statement = (SelectAnalyzedStatement) analyzer.analyze(
-                SqlParser.createStatement(stmt), args, new Object[0][]).analyzedStatement();
+                SqlParser.createStatement(stmt), args, new Object[0][], ReferenceInfos.DEFAULT_SCHEMA_NAME).analyzedStatement();
         return statement.relation().querySpec().where();
     }