incubator-hawq git commit: HAWQ-727. Fix featuretest makefile error.
Repository: incubator-hawq Updated Branches: refs/heads/master 5a3f69976 -> 02411abad HAWQ-727. Fix featuretest makefile error. Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/02411aba Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/02411aba Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/02411aba Branch: refs/heads/master Commit: 02411abad13329f216ff48bc6e6cde246fa36744 Parents: 5a3f699 Author: hzhang2Authored: Wed May 11 11:03:04 2016 +0800 Committer: hzhang2 Committed: Wed May 11 11:06:01 2016 +0800 -- GNUmakefile.in | 2 +- configure.in | 2 +- src/Makefile | 4 ++-- src/test/Makefile| 4 +++- src/test/feature/lib/hawq-config.cpp | 1 + src/test/feature/lib/string-util.cpp | 2 +- src/test/feature/lib/xml-parser.cpp | 1 + 7 files changed, 10 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/GNUmakefile.in -- diff --git a/GNUmakefile.in b/GNUmakefile.in index 4da5951..d38273c 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -86,8 +86,8 @@ distclean maintainer-clean: -$(MAKE) -C depends/libyarn $@ -$(MAKE) -C config $@ -$(MAKE) -C tools $@ + -$(MAKE) -C src feature_test clean -$(MAKE) -C src $@ - $(MAKE) -C src feature_test clean -rm -f config.cache config.log config.status GNUmakefile # Garbage from autoconf: @rm -rf autom4te.cache/ http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/configure.in -- diff --git a/configure.in b/configure.in index d2459b8..391e17e 100644 --- a/configure.in +++ b/configure.in @@ -2058,7 +2058,7 @@ fi AC_SUBST(vpath_build) -AC_CONFIG_FILES([GNUmakefile src/VERSIONS.mk depends/libhdfs3/Makefile.global depends/libyarn/Makefile.global src/Makefile.global src/pl/pljava/src/java/Makefile.global]) +AC_CONFIG_FILES([GNUmakefile src/VERSIONS.mk src/Makefile.global depends/libhdfs3/Makefile.global depends/libyarn/Makefile.global src/Makefile.global src/pl/pljava/src/java/Makefile.global]) AC_CONFIG_LINKS([ src/backend/port/dynloader.c:src/backend/port/dynloader/${template}.c http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/Makefile -- diff --git a/src/Makefile b/src/Makefile index 866a9bf..2b08a89 100644 --- a/src/Makefile +++ b/src/Makefile @@ -63,7 +63,7 @@ clean: $(MAKE) -C tutorial NO_PGXS=1 $@ $(MAKE) -C test/thread $@ $(MAKE) -C test/regress $@ - $(MAKE) -C test/feature/example $@ + $(MAKE) -C test/feature $@ $(MAKE) -C tools/fsync $@ distclean maintainer-clean: @@ -80,7 +80,7 @@ distclean maintainer-clean: $(MAKE) -C tutorial NO_PGXS=1 $@ $(MAKE) -C test/thread $@ $(MAKE) -C test/regress $@ - $(MAKE) -C test/feature/example clean + $(MAKE) -C test/feature clean $(MAKE) -C tools/fsync $@ rm -f Makefile.port Makefile.global http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/Makefile -- diff --git a/src/test/Makefile b/src/test/Makefile index ba4e729..9bc9b5c 100644 --- a/src/test/Makefile +++ b/src/test/Makefile @@ -14,10 +14,12 @@ #.DEFAULT: # $(MAKE) -C regress $@ -.PHONY: feature_test clean +.PHONY: feature_test clean distclean feature_test: $(MAKE) -C feature all clean: $(MAKE) -C feature clean + +distclean: clean http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/feature/lib/hawq-config.cpp -- diff --git a/src/test/feature/lib/hawq-config.cpp b/src/test/feature/lib/hawq-config.cpp index d973328..263e54a 100644 --- a/src/test/feature/lib/hawq-config.cpp +++ b/src/test/feature/lib/hawq-config.cpp @@ -5,6 +5,7 @@ #include #include #include +#include #include "command.h" #include "psql.h" http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/02411aba/src/test/feature/lib/string-util.cpp -- diff --git a/src/test/feature/lib/string-util.cpp b/src/test/feature/lib/string-util.cpp index 4474c80..e4bb7f5 100644 --- a/src/test/feature/lib/string-util.cpp +++ b/src/test/feature/lib/string-util.cpp @@ -42,7 +42,7 @@ std::string StringUtil::lower(const std::string ) { result.append(, sizeof(char)); } -
[incubator-hawq] Git Push Summary
Repository: incubator-hawq Updated Branches: refs/heads/HAWQ-703 [deleted] 6917914a1
incubator-hawq git commit: HAWQ-703. Serialize HCatalog Complex Types to plain text (as Hive profile).
Repository: incubator-hawq Updated Branches: refs/heads/master e60c805f4 -> 00f6074bd HAWQ-703. Serialize HCatalog Complex Types to plain text (as Hive profile). Project: http://git-wip-us.apache.org/repos/asf/incubator-hawq/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-hawq/commit/00f6074b Tree: http://git-wip-us.apache.org/repos/asf/incubator-hawq/tree/00f6074b Diff: http://git-wip-us.apache.org/repos/asf/incubator-hawq/diff/00f6074b Branch: refs/heads/master Commit: 00f6074bd0e25ca6ce8224ffcca4ef7a571eee10 Parents: e60c805 Author: Oleksandr DiachenkoAuthored: Tue May 10 13:28:54 2016 -0700 Committer: Oleksandr Diachenko Committed: Tue May 10 13:28:54 2016 -0700 -- .../java/org/apache/hawq/pxf/api/Metadata.java | 32 -- .../hawq/pxf/api/utilities/EnumHawqType.java| 105 + .../org/apache/hawq/pxf/api/MetadataTest.java | 60 ++ .../hive/utilities/EnumHiveToHawqType.java | 113 ++ .../plugins/hive/utilities/HiveUtilities.java | 114 +++ .../plugins/hive/HiveMetadataFetcherTest.java | 12 +- .../hive/utilities/HiveUtilitiesTest.java | 56 +++-- .../hawq/pxf/service/MetadataResponse.java | 6 +- .../pxf/service/MetadataResponseFormatter.java | 3 +- .../service/MetadataResponseFormatterTest.java | 60 ++ src/backend/catalog/external/externalmd.c | 57 +- src/backend/utils/adt/pxf_functions.c | 9 +- src/bin/psql/describe.c | 31 - src/include/catalog/external/itemmd.h | 3 + src/include/catalog/pg_proc.h | 4 +- src/include/catalog/pg_proc.sql | 2 +- .../data/hcatalog/invalid_numeric_range.json| 2 +- .../hcatalog/invalid_typemod_timestamp.json | 2 +- src/test/regress/data/hcatalog/multi_table.json | 2 +- .../data/hcatalog/multi_table_duplicates.json | 2 +- .../regress/data/hcatalog/null_field_name.json | 1 + .../data/hcatalog/null_field_source_type.json | 1 + .../regress/data/hcatalog/null_field_type.json | 1 + src/test/regress/data/hcatalog/null_fields.json | 1 + src/test/regress/data/hcatalog/null_item.json | 1 + .../regress/data/hcatalog/null_item_name.json | 1 + .../regress/data/hcatalog/null_item_path.json | 1 + .../regress/data/hcatalog/single_table.json | 2 +- src/test/regress/input/json_load.source | 35 ++ src/test/regress/output/hcatalog_lookup.source | 8 +- src/test/regress/output/json_load.source| 35 ++ 31 files changed, 617 insertions(+), 145 deletions(-) -- http://git-wip-us.apache.org/repos/asf/incubator-hawq/blob/00f6074b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/Metadata.java -- diff --git a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/Metadata.java b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/Metadata.java index 4fc510d..9e1c137 100644 --- a/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/Metadata.java +++ b/pxf/pxf-api/src/main/java/org/apache/hawq/pxf/api/Metadata.java @@ -23,6 +23,7 @@ package org.apache.hawq.pxf.api; import java.util.ArrayList; import java.util.List; +import org.apache.hawq.pxf.api.utilities.EnumHawqType; import org.apache.commons.lang.StringUtils; /** @@ -67,25 +68,32 @@ public class Metadata { } /** - * Class representing item field - name and type. + * Class representing item field - name, type, source type, modifiers. + * Type - exposed type of field + * Source type - type of field in underlying source + * Modifiers - additional attributes which describe type or field */ public static class Field { private String name; -private String type; // TODO: change to enum +private EnumHawqType type; // field type which PXF exposes +private String sourceType; // field type PXF reads from private String[] modifiers; // type modifiers, optional field -public Field(String name, String type) { - -if (StringUtils.isBlank(name) || StringUtils.isBlank(type)) { -throw new IllegalArgumentException("Field name and type cannot be empty"); +public Field(String name, EnumHawqType type, String sourceType) { +if (StringUtils.isBlank(name) +|| type == null +|| StringUtils.isBlank(sourceType)) { +throw new IllegalArgumentException( +"Field name, type and source type cannot be empty"); } - this.name = name; this.type = type; +this.sourceType = sourceType; } -public Field(String name, String type,
[incubator-hawq] Git Push Summary
Repository: incubator-hawq Updated Branches: refs/heads/HAWQ-717 [deleted] 8e1384cc6