asterixdb git commit: Align Jetty Version, ResultExtractor.extract Accessible

2016-08-03 Thread mblow 
Repository: asterixdb
Updated Branches:
  refs/heads/master d0888e682 -> d8f306e0c


Align Jetty Version, ResultExtractor.extract Accessible

Aligns jetty version with hyracks

Change-Id: Iaa0a6cbd5dc6a4aaa153b0f0e2414ec6402256ce
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1047
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Reviewed-by: Till Westmann 


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

Branch: refs/heads/master
Commit: d8f306e0cb6c0dcc43768dd63524ea4fcc76f607
Parents: d0888e6
Author: Michael Blow 
Authored: Wed Aug 3 20:50:24 2016 -0400
Committer: Michael Blow 
Committed: Wed Aug 3 19:28:39 2016 -0700

--
 asterixdb/asterix-app/pom.xml| 4 ++--
 .../test/java/org/apache/asterix/test/aql/ResultExtractor.java   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8f306e0/asterixdb/asterix-app/pom.xml
--
diff --git a/asterixdb/asterix-app/pom.xml b/asterixdb/asterix-app/pom.xml
index 70c777d..be1c124 100644
--- a/asterixdb/asterix-app/pom.xml
+++ b/asterixdb/asterix-app/pom.xml
@@ -184,14 +184,14 @@
 
   org.eclipse.jetty
   jetty-server
-  8.0.0.M2
+  8.0.0.RC0
   jar
   compile
 
 
   org.eclipse.jetty
   jetty-servlet
-  8.0.0.M2
+  8.0.0.RC0
   jar
   compile
 

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d8f306e0/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java
--
diff --git 
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java
 
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java
index 13ab717..efadc8d 100644
--- 
a/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java
+++ 
b/asterixdb/asterix-common/src/test/java/org/apache/asterix/test/aql/ResultExtractor.java
@@ -38,7 +38,7 @@ public class ResultExtractor {
 
 private static final Logger LOGGER = 
Logger.getLogger(ResultExtractor.class.getName());
 
-static InputStream extract(InputStream resultStream) throws Exception {
+public static InputStream extract(InputStream resultStream) throws 
Exception {
 String result = IOUtils.toString(resultStream, 
Charset.forName("UTF-8"));
 
 LOGGER.fine("+++\n" + result + "\n+++\n");

asterixdb git commit: handle missing format parameter

2016-08-03 Thread tillw 
Repository: asterixdb
Updated Branches:
  refs/heads/master ca3b9b28f -> d0888e682


handle missing format parameter

Change-Id: I90b6da30e2e3a52d68cdf29b0026125dca4da3e4
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1046
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: Yingyi Bu 


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

Branch: refs/heads/master
Commit: d0888e682377eb1772cc4b7db5e17074c34125ef
Parents: ca3b9b2
Author: Till Westmann 
Authored: Wed Aug 3 15:47:33 2016 -0700
Committer: Till Westmann 
Committed: Wed Aug 3 18:59:32 2016 -0700

--
 .../asterix/api/http/servlet/QueryServiceServlet.java   | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/d0888e68/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
--
diff --git 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
index f208694..d3507d8 100644
--- 
a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
+++ 
b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/servlet/QueryServiceServlet.java
@@ -215,6 +215,9 @@ public class QueryServiceServlet extends HttpServlet {
 }
 
 private static String getParameterValue(String content, String attribute) {
+if (content == null || attribute == null) {
+return null;
+}
 int sc = content.indexOf(';');
 if (sc < 0) {
 return null;
@@ -229,6 +232,10 @@ public class QueryServiceServlet extends HttpServlet {
 return null;
 }
 
+private static String toLower(String s) {
+return s != null ? s.toLowerCase() : s;
+}
+
 private static SessionConfig.OutputFormat getFormat(String format) {
 if (format != null) {
 if (format.startsWith(MediaType.CSV.str())) {
@@ -262,7 +269,7 @@ public class QueryServiceServlet extends HttpServlet {
 return app;
 };
 
-String formatstr = 
request.getParameter(Parameter.FORMAT.str()).toLowerCase();
+final String formatstr = 
toLower(request.getParameter(Parameter.FORMAT.str()));
 SessionConfig.OutputFormat format = getFormat(formatstr);
 SessionConfig sessionConfig = new SessionConfig(resultWriter, format, 
resultPrefix, resultPostfix);
 sessionConfig.set(SessionConfig.FORMAT_WRAPPER_ARRAY, true);

asterixdb git commit: ASTERIXDB-1479: Change storage valid int and add explicit version

2016-08-03 Thread imaxon 
Repository: asterixdb
Updated Branches:
  refs/heads/master 9f110ab01 -> ca3b9b28f


ASTERIXDB-1479: Change storage valid int and add explicit version

This change will stop old versions from possibly corrupting data written
by newer versions of Hyracks. It also adds an explicit version to the
tree metadata that must match the version at runtime.

Change-Id: I888ff0eacf5b3cb6ad7ec002c74f113c6ffcd496
Reviewed-on: https://asterix-gerrit.ics.uci.edu/919
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Integration-Tests: Jenkins 
Reviewed-by: Michael Blow 


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

Branch: refs/heads/master
Commit: ca3b9b28f681382b88781d8c62aa1e0fd53a2659
Parents: 9f110ab
Author: Ian Maxon 
Authored: Fri Jul 29 15:51:28 2016 -0700
Committer: Ian Maxon 
Committed: Wed Aug 3 17:06:21 2016 -0700

--
 .../metadata/bootstrap/MetadataBootstrap.java   |  3 +-
 .../PersistentLocalResourceFactory.java |  6 ++-
 .../PersistentLocalResourceRepository.java  | 15 +--
 .../am/common/api/ITreeIndexMetaDataFrame.java  |  7 
 .../am/common/dataflow/IndexDataflowHelper.java |  3 +-
 .../am/common/frames/LIFOMetaDataFrame.java | 22 +++---
 .../freepage/LinkedMetaDataPageManager.java |  2 +-
 .../impls/AbstractLSMIndexFileManager.java  | 43 ++--
 .../common/file/ILocalResourceFactory.java  |  3 +-
 .../storage/common/file/LocalResource.java  | 10 -
 .../file/TransientLocalResourceFactory.java |  6 ++-
 11 files changed, 89 insertions(+), 31 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ca3b9b28/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
--
diff --git 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
index c180be4..757694d 100644
--- 
a/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
+++ 
b/asterixdb/asterix-metadata/src/main/java/org/apache/asterix/metadata/bootstrap/MetadataBootstrap.java
@@ -77,6 +77,7 @@ import 
org.apache.hyracks.api.dataflow.value.IBinaryComparatorFactory;
 import org.apache.hyracks.api.dataflow.value.ITypeTraits;
 import org.apache.hyracks.api.io.FileReference;
 import org.apache.hyracks.api.io.IIOManager;
+import org.apache.hyracks.storage.am.common.frames.LIFOMetaDataFrame;
 import org.apache.hyracks.storage.am.lsm.btree.impls.LSMBTree;
 import org.apache.hyracks.storage.am.lsm.btree.util.LSMBTreeUtils;
 import org.apache.hyracks.storage.am.lsm.common.api.ILSMMergePolicyFactory;
@@ -373,7 +374,7 @@ public class MetadataBootstrap {
 localResourceMetadata, LocalResource.LSMBTreeResource);
 ILocalResourceFactory localResourceFactory = 
localResourceFactoryProvider.getLocalResourceFactory();
 
localResourceRepository.insert(localResourceFactory.createLocalResource(resourceID,
 resourceName,
-metadataPartition.getPartitionId(), absolutePath));
+metadataPartition.getPartitionId(), 
LIFOMetaDataFrame.VERSION, absolutePath));
 dataLifecycleManager.register(absolutePath, lsmBtree);
 } else {
 final LocalResource resource = 
localResourceRepository.getResourceByPath(absolutePath);

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/ca3b9b28/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceFactory.java
--
diff --git 
a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceFactory.java
 
b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceFactory.java
index 15224e2..33e5bf2 100644
--- 
a/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceFactory.java
+++ 
b/asterixdb/asterix-transactions/src/main/java/org/apache/asterix/transaction/management/resource/PersistentLocalResourceFactory.java
@@ -33,7 +33,9 @@ public class PersistentLocalResourceFactory implements 
ILocalResourceFactory {
 }
 
 @Override

asterixdb git commit: Filter Sample Cluster Scripts To Enable Extension

2016-08-03 Thread mblow 
Repository: asterixdb
Updated Branches:
  refs/heads/master 0ab8ae44d -> 9f110ab01


Filter Sample Cluster Scripts To Enable Extension

Change-Id: I6f6f27ddcc2311630e8e234ce2770cbb2c66d253
Reviewed-on: https://asterix-gerrit.ics.uci.edu/1044
Sonar-Qube: Jenkins 
Tested-by: Jenkins 
Reviewed-by: Till Westmann 


Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/9f110ab0
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/9f110ab0
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/9f110ab0

Branch: refs/heads/master
Commit: 9f110ab01780a36b10d89e17d8ad6b65d38685bb
Parents: 0ab8ae4
Author: Michael Blow 
Authored: Wed Aug 3 17:25:33 2016 -0400
Committer: Michael Blow 
Committed: Wed Aug 3 15:01:01 2016 -0700

--
 asterixdb/asterix-server/pom.xml  |  5 -
 .../src/main/assembly/binary-assembly.xml | 14 +-
 .../src/main/assembly/filter.properties   |  5 +
 .../samples/local/bin/start-sample-cluster.sh |  8 
 .../samples/local/bin/stop-sample-cluster.sh  |  2 +-
 .../src/main/resources/samples/local/conf/cc.conf |  2 +-
 asterixdb/pom.xml |  2 +-
 7 files changed, 29 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f110ab0/asterixdb/asterix-server/pom.xml
--
diff --git a/asterixdb/asterix-server/pom.xml b/asterixdb/asterix-server/pom.xml
index b083bbc..78e990f 100644
--- a/asterixdb/asterix-server/pom.xml
+++ b/asterixdb/asterix-server/pom.xml
@@ -148,8 +148,11 @@
 
   
 
+  
+
${project.basedir}/src/main/assembly/filter.properties
+  
   
-src/main/assembly/binary-assembly.xml
+
${project.basedir}/src/main/assembly/binary-assembly.xml
   
 
 package

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f110ab0/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
--
diff --git a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml 
b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
index 379a6f2..4afde5f 100644
--- a/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
+++ b/asterixdb/asterix-server/src/main/assembly/binary-assembly.xml
@@ -43,9 +43,21 @@
   src/main/resources
   .
   
-LICENSE*
 samples/**
   
+  
+**/*.sh
+  
+  true
+
+
+  src/main/resources
+  .
+  
+samples/**/*.sh
+  
+  true
+  0755
 
 
   target/appassembler/repo

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f110ab0/asterixdb/asterix-server/src/main/assembly/filter.properties
--
diff --git a/asterixdb/asterix-server/src/main/assembly/filter.properties 
b/asterixdb/asterix-server/src/main/assembly/filter.properties
new file mode 100644
index 000..301aeaf
--- /dev/null
+++ b/asterixdb/asterix-server/src/main/assembly/filter.properties
@@ -0,0 +1,5 @@
+NC_SERVICE_COMMAND=asterixncservice
+CC_COMMAND=asterixcc
+NC_COMMAND=asterixnc
+LISTEN_PORT=19002
+SHUTDOWN_SERVLET_PATH=admin/shutdown

http://git-wip-us.apache.org/repos/asf/asterixdb/blob/9f110ab0/asterixdb/asterix-server/src/main/resources/samples/local/bin/start-sample-cluster.sh
--
diff --git 
a/asterixdb/asterix-server/src/main/resources/samples/local/bin/start-sample-cluster.sh
 
b/asterixdb/asterix-server/src/main/resources/samples/local/bin/start-sample-cluster.sh
index 73358f2..932231f 100755
--- 
a/asterixdb/asterix-server/src/main/resources/samples/local/bin/start-sample-cluster.sh
+++ 
b/asterixdb/asterix-server/src/main/resources/samples/local/bin/start-sample-cluster.sh
@@ -54,13 +54,13 @@ mkdir -p $LOGSDIR
   echo "--"
 ) | tee -a $LOGSDIR/blue-service.log | tee -a $LOGSDIR/red-service.log >> 
$LOGSDIR/cc.log
 
-$INSTALLDIR/bin/asterixncservice -logdir - -config-file 
$CLUSTERDIR/conf/blue.conf >> $LOGSDIR/blue-service.log 2>&1 &
-$INSTALLDIR/bin/asterixncservice -logdir - >> $LOGSDIR/red-service.log 2>&1 &
-$INSTALLDIR/bin/asterixcc -config-file $CLUSTERDIR/conf/cc.conf >> 
$LOGSDIR/cc.log 2>&1 &
+$INSTALLDIR/bin/${NC_SERVICE_COMMAND} -logdir - -config-file 
$CLUSTERDIR/conf/blue.conf >> $LOGSDIR/blue-service.log 2>&1 &