Repository: incubator-hawq
Updated Branches:
  refs/heads/master 511d2a98a -> f67caa41d


HAWQ-1578. Regression Test (Feature->Ranger)Failed


Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/f67caa41
Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/f67caa41
Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/f67caa41

Branch: refs/heads/master
Commit: f67caa41d4035062bb5ea789aa1256c45fa3af4e
Parents: 511d2a9
Author: Chiyang Wan <chiyang10...@gmail.com>
Authored: Fri Jan 5 08:21:27 2018 +0800
Committer: Chiyang Wan <chiyang10...@gmail.com>
Committed: Fri Jan 5 08:21:27 2018 +0800

----------------------------------------------------------------------
 src/backend/access/external/plugstorage.c | 10 ++++++++++
 src/include/access/plugstorage_utils.h    |  1 +
 2 files changed, 11 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/f67caa41/src/backend/access/external/plugstorage.c
----------------------------------------------------------------------
diff --git a/src/backend/access/external/plugstorage.c 
b/src/backend/access/external/plugstorage.c
index 21dd51e..ad7d260 100644
--- a/src/backend/access/external/plugstorage.c
+++ b/src/backend/access/external/plugstorage.c
@@ -59,6 +59,11 @@ void getExternalTableTypeInList(const char formatType,
        }
        else if (fmttype_is_custom(formatType))
        {
+               *formatterType = ExternalTableType_CUSTOM;
+               *formatterName = NULL;
+       }
+       else if (fmttype_is_custom(formatType))
+       {
                Assert(formatOptions);
 
                *formatterName = 
getExtTblFormatterTypeInFmtOptsList(formatOptions);
@@ -90,6 +95,11 @@ void getExternalTableTypeInStr(const char formatType,
        }
        else if (fmttype_is_custom(formatType))
        {
+               *formatterType = ExternalTableType_CUSTOM;
+               *formatterName = NULL;
+       }
+       else if (fmttype_is_custom(formatType))
+       {
                Assert(formatOptions);
 
                *formatterName = 
getExtTblFormatterTypeInFmtOptsStr(formatOptions);

http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/f67caa41/src/include/access/plugstorage_utils.h
----------------------------------------------------------------------
diff --git a/src/include/access/plugstorage_utils.h 
b/src/include/access/plugstorage_utils.h
index 6e1bf6b..e0a397d 100644
--- a/src/include/access/plugstorage_utils.h
+++ b/src/include/access/plugstorage_utils.h
@@ -85,6 +85,7 @@ typedef enum
        ExternalTableType_GENERIC,     /* GENERIC external table format and 
protocol */
        ExternalTableType_TEXT,        /* TEXT format with gpfdist(s), http, 
command protocol */
        ExternalTableType_CSV,         /* CSV format with gpfdist(s), http, 
command protocol */
+       ExternalTableType_CUSTOM,      /* Temporary workaround to support the 
old framework */
        ExternalTableType_PLUG,        /* Pluggable format with hdfs protocol, 
i.e., ORC */
        ExternalTableType_Invalid
 } ExternalTableType;

Reply via email to