You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hawq.apache.org by hu...@apache.org on 2019/05/10 06:04:39 UTC

[hawq] branch master updated (f62d3f4 -> 74b24a3)

This is an automated email from the ASF dual-hosted git repository.

huor pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git.


    from f62d3f4  HAWQ-1710. Add ORC reader implement in hawq
     new 4809a1c  HAWQ-1715. bump hawq version to 2.5 in contrib/hawq-ambari-plugin/build.properties for Apache HAWQ 2.5.0
     new 9247b8c  HAWQ-1714. bump hawq version to 2.5 in pom.xml for Apache HAWQ 2.5.0
     new 74b24a3  HAWQ-1712. enable apache hawq build in docker

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 GNUmakefile.in                                    | 6 +++---
 contrib/hawq-ambari-plugin/build.properties       | 4 ++--
 depends/dbcommon/src/dbcommon/nodes/datum.h       | 6 +++---
 depends/dbcommon/src/dbcommon/utils/memory-pool.h | 2 --
 pom.xml                                           | 2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)


[hawq] 03/03: HAWQ-1712. enable apache hawq build in docker

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git

commit 74b24a32ca10f2506a6e2aa24776a7ac44ebe1d5
Author: tuyu <tu...@oushu.io>
AuthorDate: Wed May 8 13:48:17 2019 +0800

    HAWQ-1712. enable apache hawq build in docker
---
 GNUmakefile.in                                    | 6 +++---
 depends/dbcommon/src/dbcommon/nodes/datum.h       | 6 +++---
 depends/dbcommon/src/dbcommon/utils/memory-pool.h | 2 --
 3 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/GNUmakefile.in b/GNUmakefile.in
index cbe1f25..f4ecf65 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,13 +17,13 @@ all:
 	$(MAKE) -C depends/libyarn $@
 	$(MAKE) -C depends/libyarn install
 	$(MAKE) -C depends/dbcommon $@
-	$(MAKE) -C depends/dbcommon unittest
+	# $(MAKE) -C depends/dbcommon unittest
 	$(MAKE) -C depends/dbcommon install
 	$(MAKE) -C depends/univplan $@
-	$(MAKE) -C depends/univplan unittest
+	# $(MAKE) -C depends/univplan unittest
 	$(MAKE) -C depends/univplan install
 	$(MAKE) -C depends/storage $@
-	$(MAKE) -C depends/storage unittest
+	# $(MAKE) -C depends/storage unittest
 	$(MAKE) -C depends/storage install
 	$(MAKE) -C src $@
 	$(MAKE) -C config $@
diff --git a/depends/dbcommon/src/dbcommon/nodes/datum.h b/depends/dbcommon/src/dbcommon/nodes/datum.h
index 0173081..fc78a24 100644
--- a/depends/dbcommon/src/dbcommon/nodes/datum.h
+++ b/depends/dbcommon/src/dbcommon/nodes/datum.h
@@ -433,12 +433,12 @@ struct DatumCreater<T, sizeof(MagmaTid)> {
 };
 
 // Declare DatumCreate template for std::string.
-template <typename T>
-struct DatumCreater<T, sizeof(std::string)> {
+template <>
+struct DatumCreater<std::string, sizeof(std::string)> {
   // Create a datum with given std::string.
   // @param value The initial value of the datum.
   // @return Return a new datum.
-  static inline Datum CreateDatum(const T &value) {
+  static inline Datum CreateDatum(const std::string &value) {
     return Datum(reinterpret_cast<int64_t>(value.c_str()));
   }
 };
diff --git a/depends/dbcommon/src/dbcommon/utils/memory-pool.h b/depends/dbcommon/src/dbcommon/utils/memory-pool.h
index 86e8927..32c68ce 100644
--- a/depends/dbcommon/src/dbcommon/utils/memory-pool.h
+++ b/depends/dbcommon/src/dbcommon/utils/memory-pool.h
@@ -87,7 +87,6 @@ class MemoryPool {
     }
     space = newSize;
     void *ret = p;
-    std::align(align, size, ret, space);
     activeMem[ret] = MemAddr{p, space};
     return reinterpret_cast<T *>(ret);
   }
@@ -113,7 +112,6 @@ class MemoryPool {
       activeMem.erase(p);
       p = ret;
       ret = p;
-      std::align(align, size, ret, space);
       activeMem[ret] = MemAddr{p, space};
     }
 


[hawq] 02/03: HAWQ-1714. bump hawq version to 2.5 in pom.xml for Apache HAWQ 2.5.0

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git

commit 9247b8c694946d07f0a8b439778c05e28286223c
Author: tuyu <tu...@oushu.io>
AuthorDate: Wed May 8 14:53:41 2019 +0800

    HAWQ-1714. bump hawq version to 2.5 in pom.xml for Apache HAWQ 2.5.0
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 3daeb48..421f433 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
  
   <groupId>org.apache.hawq</groupId>
   <artifactId>hawq</artifactId>
-  <version>2.4</version>
+  <version>2.5</version>
   <packaging>pom</packaging>
 
   <build>  


[hawq] 01/03: HAWQ-1715. bump hawq version to 2.5 in contrib/hawq-ambari-plugin/build.properties for Apache HAWQ 2.5.0

Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

huor pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hawq.git

commit 4809a1cb46d216b29175ad561e030775f69c94b2
Author: tuyu <tu...@oushu.io>
AuthorDate: Wed May 8 15:01:13 2019 +0800

    HAWQ-1715. bump hawq version to 2.5 in contrib/hawq-ambari-plugin/build.properties for Apache HAWQ 2.5.0
---
 contrib/hawq-ambari-plugin/build.properties | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/hawq-ambari-plugin/build.properties b/contrib/hawq-ambari-plugin/build.properties
index 3b8747f..3e35d22 100644
--- a/contrib/hawq-ambari-plugin/build.properties
+++ b/contrib/hawq-ambari-plugin/build.properties
@@ -1,8 +1,8 @@
-hawq.release.version=2.4.0
+hawq.release.version=2.5.0
 hawq.common.services.version=2.0.0
 pxf.release.version=3.2.1
 pxf.common.services.version=3.0.0
 hawq.repo.prefix=hawq
 hawq.addons.repo.prefix=hawq-add-ons
-repository.version=2.4.0.0
+repository.version=2.5.0.0
 default.stack=HDP-2.5