Merge branch 'teiid-jira' of https://github.com/kylinsoong/teiid

teiid · Nov 11, 2016 · 8329bcd · 8329bcd
2 parents df5695a + 2954e60
commit 8329bcd
Show file tree

Hide file tree

Showing 11 changed files with 485 additions and 14 deletions.
diff --git a/...jdbc/translator-hbase/src/main/java/org/teiid/translator/hbase/HBaseExecutionFactory.java b/...jdbc/translator-hbase/src/main/java/org/teiid/translator/hbase/HBaseExecutionFactory.java
@@ -44,13 +44,13 @@
 import org.teiid.translator.Translator;
 import org.teiid.translator.TranslatorException;
 import org.teiid.translator.TypeFacility;
-import org.teiid.translator.jdbc.JDBCExecutionFactory;
 import org.teiid.translator.jdbc.JDBCMetdataProcessor;
 import org.teiid.translator.jdbc.JDBCUpdateExecution;
 import org.teiid.util.Version;
 
-@Translator(name="hbase", description="HBase Translator, reads and writes the data to HBase")
-public class HBaseExecutionFactory extends JDBCExecutionFactory {
+@Deprecated
+@Translator(name="hbase", description="HBase Translator, reads and writes the data to HBase", deprecated="phoenix")
+public class HBaseExecutionFactory extends PhoenixExecutionFactory {
 
     public static String HBASE = "hbase"; //$NON-NLS-1$
     public static final Version V_4_8 = Version.getVersion("4.8"); //$NON-NLS-1$

diff --git a/.../translator-hbase/src/main/java/org/teiid/translator/hbase/HBaseSQLConversionVisitor.java b/.../translator-hbase/src/main/java/org/teiid/translator/hbase/HBaseSQLConversionVisitor.java
@@ -34,9 +34,9 @@
 
 public class HBaseSQLConversionVisitor extends org.teiid.translator.jdbc.SQLConversionVisitor {
 
-    private HBaseExecutionFactory executionFactory ;
+    private PhoenixExecutionFactory executionFactory ;
 
-    public HBaseSQLConversionVisitor(HBaseExecutionFactory ef) {
+    public HBaseSQLConversionVisitor(PhoenixExecutionFactory ef) {
         super(ef);
         this.executionFactory = ef;
     }

diff --git a/.../jdbc/translator-hbase/src/main/java/org/teiid/translator/hbase/HBaseUpdateExecution.java b/.../jdbc/translator-hbase/src/main/java/org/teiid/translator/hbase/HBaseUpdateExecution.java
@@ -39,7 +39,7 @@ public HBaseUpdateExecution(Command command,
                                 ExecutionContext executionContext, 
                                 RuntimeMetadata metadata,
                                 Connection conn, 
-                                HBaseExecutionFactory executionFactory) throws TranslatorException {
+                                PhoenixExecutionFactory executionFactory) throws TranslatorException {
         super(command, conn, executionContext, executionFactory);
 
         setCommitMode(conn);