apache · khalidhuseynov · May 12, 2015 · May 12, 2015 · May 12, 2015 · May 12, 2015
diff --git a/conf/zeppelin-site.xml.template b/conf/zeppelin-site.xml.template
@@ -66,7 +66,7 @@
 
 <property>
   <name>zeppelin.interpreters</name>
-  <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.TajoInterpreter</value>
+  <value>org.apache.zeppelin.spark.SparkInterpreter,org.apache.zeppelin.spark.PySparkInterpreter,org.apache.zeppelin.spark.SparkSqlInterpreter,org.apache.zeppelin.spark.DepInterpreter,org.apache.zeppelin.markdown.Markdown,org.apache.zeppelin.angular.AngularInterpreter,org.apache.zeppelin.shell.ShellInterpreter,org.apache.zeppelin.hive.HiveInterpreter,org.apache.zeppelin.tajo.jdbc.TajoInterpreter,org.apache.zeppelin.tajo.thrift.TajoInterpreter</value>
   <description>Comma separated interpreter configurations. First interpreter become a default</description>
 </property>
 

diff --git a/pom.xml b/pom.xml
@@ -91,7 +91,8 @@
     <module>angular</module>
     <module>shell</module>
     <module>hive</module>
-    <module>tajo</module>
+    <module>tajo-jdbc</module>
+    <module>tajo-thrift</module>
     <module>zeppelin-web</module>
     <module>zeppelin-server</module>
     <module>zeppelin-distribution</module>

diff --git a/tajo/pom.xml → tajo-jdbc/pom.xml b/tajo/pom.xml → tajo-jdbc/pom.xml
@@ -25,10 +25,10 @@
   </parent>
 
   <groupId>org.apache.zeppelin</groupId>
-  <artifactId>zeppelin-tajo</artifactId>
+  <artifactId>zeppelin-tajo-jdbc</artifactId>
   <packaging>jar</packaging>
   <version>0.5.0-incubating-SNAPSHOT</version>
-  <name>Zeppelin: Tajo interpreter</name>
+  <name>Zeppelin: Tajo JDBC interpreter</name>
   <url>http://www.apache.org</url>
 
   <properties>
@@ -100,7 +100,7 @@
               <goal>copy-dependencies</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/../../interpreter/tajo</outputDirectory>
+              <outputDirectory>${project.build.directory}/../../interpreter/tajo-jdbc</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>false</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>
@@ -114,7 +114,7 @@
               <goal>copy</goal>
             </goals>
             <configuration>
-              <outputDirectory>${project.build.directory}/../../interpreter/tajo</outputDirectory>
+              <outputDirectory>${project.build.directory}/../../interpreter/tajo-jdbc</outputDirectory>
               <overWriteReleases>false</overWriteReleases>
               <overWriteSnapshots>false</overWriteSnapshots>
               <overWriteIfNewer>true</overWriteIfNewer>

diff --git a/...apache/zeppelin/tajo/TajoInterpreter.java → ...e/zeppelin/tajo/jdbc/TajoInterpreter.java b/...apache/zeppelin/tajo/TajoInterpreter.java → ...e/zeppelin/tajo/jdbc/TajoInterpreter.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 import java.sql.*;
 import java.util.List;
@@ -45,8 +45,8 @@ public class TajoInterpreter extends Interpreter {
 
   static {
     Interpreter.register(
-      "tajo",
-      "tajo",
+      "tsqlj",
+      "tajo-jdbc",
       TajoInterpreter.class.getName(),
       new InterpreterPropertyBuilder()
         .add(TAJO_JDBC_URI, "jdbc:tajo://localhost:26002/default", "The URL for TajoServer.")

diff --git a/...he/zeppelin/tajo/TajoInterpreterTest.java → ...ppelin/tajo/jdbc/TajoInterpreterTest.java b/...he/zeppelin/tajo/TajoInterpreterTest.java → ...ppelin/tajo/jdbc/TajoInterpreterTest.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 import com.google.gson.JsonParseException;
 import org.apache.tajo.jdbc.TajoDriver;

diff --git a/...pache/zeppelin/tajo/TesterConnection.java → .../zeppelin/tajo/jdbc/TesterConnection.java b/...pache/zeppelin/tajo/TesterConnection.java → .../zeppelin/tajo/jdbc/TesterConnection.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 
 import java.sql.*;

diff --git a/...zeppelin/tajo/TesterDatabaseMetaData.java → ...lin/tajo/jdbc/TesterDatabaseMetaData.java b/...zeppelin/tajo/TesterDatabaseMetaData.java → ...lin/tajo/jdbc/TesterDatabaseMetaData.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;

diff --git a/...apache/zeppelin/tajo/TesterResultSet.java → ...e/zeppelin/tajo/jdbc/TesterResultSet.java b/...apache/zeppelin/tajo/TesterResultSet.java → ...e/zeppelin/tajo/jdbc/TesterResultSet.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 import java.math.BigDecimal;
 import java.sql.*;

diff --git a/...eppelin/tajo/TesterResultSetMetaData.java → ...in/tajo/jdbc/TesterResultSetMetaData.java b/...eppelin/tajo/TesterResultSetMetaData.java → ...in/tajo/jdbc/TesterResultSetMetaData.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 import java.sql.ResultSetMetaData;
 import java.sql.SQLException;

diff --git a/...apache/zeppelin/tajo/TesterStatement.java → ...e/zeppelin/tajo/jdbc/TesterStatement.java b/...apache/zeppelin/tajo/TesterStatement.java → ...e/zeppelin/tajo/jdbc/TesterStatement.java
@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 
 import java.sql.*;

diff --git a/.../zeppelin/tajo/TesterTajoInterpreter.java → ...elin/tajo/jdbc/TesterTajoInterpreter.java b/.../zeppelin/tajo/TesterTajoInterpreter.java → ...elin/tajo/jdbc/TesterTajoInterpreter.java
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-package org.apache.zeppelin.tajo;
+package org.apache.zeppelin.tajo.jdbc;
 
 import java.sql.Connection;
 import java.sql.SQLException;

diff --git a/tajo-thrift/README.md b/tajo-thrift/README.md
@@ -0,0 +1,10 @@
+# Tajo interpreter (thrift version)
+
+This is Tajo interpreter that is using thrift interface
+
+To build this branch, build Tajo thriftserver version https://github.com/jerryjung/tajo/tree/thriftserver first and install artifact into local maven repository (mvn install)
+And then you can build Zeppelin.
+
+Tajo thrift driver keyword is %tsql
+
+
diff --git a/tajo-thrift/pom.xml b/tajo-thrift/pom.xml
@@ -0,0 +1,166 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one or more
+  ~ contributor license agreements.  See the NOTICE file distributed with
+  ~ this work for additional information regarding copyright ownership.
+  ~ The ASF licenses this file to You under the Apache License, Version 2.0
+  ~ (the "License"); you may not use this file except in compliance with
+  ~ the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <artifactId>zeppelin</artifactId>
+    <groupId>org.apache.zeppelin</groupId>
+    <version>0.5.0-incubating-SNAPSHOT</version>
+  </parent>
+
+  <groupId>org.apache.zeppelin</groupId>
+  <artifactId>zeppelin-tajo-thrift</artifactId>
+  <packaging>jar</packaging>
+  <version>0.5.0-incubating-SNAPSHOT</version>
+  <name>Zeppelin: Tajo Thrift interpreter</name>
+  <url>http://zeppelin.incubator.apache.org</url>
+
+  <properties>
+    <protobuf.version>2.5.0</protobuf.version>
+  </properties>
+
+  <dependencies>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>zeppelin-interpreter</artifactId>
+      <version>${project.version}</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.tajo</groupId>
+      <artifactId>tajo-thrift-server</artifactId>
+      <version>0.11.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.hadoop</groupId>
+      <artifactId>hadoop-client</artifactId>
+      <version>${hadoop.version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-api</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>org.slf4j</groupId>
+      <artifactId>slf4j-log4j12</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+ <repositories>
+    <!-- For unpublished tajo-thrift-server snapshot -->
+    <repository>
+      <id>nflabs public repository</id>
+      <url>https://raw.github.com/NFLabs/mvn-repo/master/snapshots</url>
+      <releases>
+        <enabled>false</enabled>
+      </releases>
+      <snapshots>
+        <enabled>true</enabled>
+      </snapshots>
+    </repository>
+  </repositories>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <version>2.7</version>
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <artifactId>maven-enforcer-plugin</artifactId>
+        <version>1.3.1</version>            
+        <executions> 
+          <execution> 
+            <id>enforce</id> 
+            <phase>none</phase> 
+          </execution>
+        </executions>
+      </plugin>
+
+    <plugin>
+    <groupId>org.apache.rat</groupId>
+    <artifactId>apache-rat-plugin</artifactId>
+    <executions>
+        <execution>
+            <phase>none</phase>
+        </execution>
+    </executions>
+    </plugin>
+
+      <plugin>
+        <artifactId>maven-dependency-plugin</artifactId>
+        <version>2.8</version>
+        <executions>
+          <execution>
+            <id>copy-dependencies</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy-dependencies</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/../../interpreter/tajo-thrift</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>false</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <includeScope>runtime</includeScope>
+            </configuration>
+          </execution>
+          <execution>
+            <id>copy-artifact</id>
+            <phase>package</phase>
+            <goals>
+              <goal>copy</goal>
+            </goals>
+            <configuration>
+              <outputDirectory>${project.build.directory}/../../interpreter/tajo-thrift</outputDirectory>
+              <overWriteReleases>false</overWriteReleases>
+              <overWriteSnapshots>false</overWriteSnapshots>
+              <overWriteIfNewer>true</overWriteIfNewer>
+              <includeScope>runtime</includeScope>
+              <artifactItems>
+                <artifactItem>
+                  <groupId>${project.groupId}</groupId>
+                  <artifactId>${project.artifactId}</artifactId>
+                  <version>${project.version}</version>
+                  <type>${project.packaging}</type>
+                </artifactItem>
+              </artifactItems>              
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>