You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by mb...@apache.org on 2018/08/15 02:27:37 UTC
[11/11] asterixdb git commit: Merge commit
'722e85d0347e628da99b5e479f3a9a993e549b03' from release-0.9.4-pre-rc
Merge commit '722e85d0347e628da99b5e479f3a9a993e549b03' from release-0.9.4-pre-rc
Change-Id: I0d3ac0768bed4271501ad3016d21f66f64ebb5fe
Project: http://git-wip-us.apache.org/repos/asf/asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/asterixdb/commit/adaff3ce
Tree: http://git-wip-us.apache.org/repos/asf/asterixdb/tree/adaff3ce
Diff: http://git-wip-us.apache.org/repos/asf/asterixdb/diff/adaff3ce
Branch: refs/heads/master
Commit: adaff3ce2e775d54610828d2614b8ac7b82c7250
Parents: 6de3315 722e85d
Author: Michael Blow <mb...@apache.org>
Authored: Tue Aug 14 18:43:19 2018 -0700
Committer: Michael Blow <mb...@apache.org>
Committed: Tue Aug 14 18:43:19 2018 -0700
----------------------------------------------------------------------
.../api/http/server/QueryServiceServlet.java | 10 +-
.../asterix/test/common/TestExecutor.java | 1 +
.../src/node/.angular-cli.json | 69 --
.../asterix-dashboard/src/node/angular.json | 141 +++
.../asterix-dashboard/src/node/karma.conf.js | 10 +-
.../asterix-dashboard/src/node/package.json | 88 +-
.../src/node/src/app/app-config.service.ts | 102 +--
.../src/node/src/app/app.component.scss | 2 +-
.../src/node/src/app/app.component.ts | 15 +-
.../src/node/src/app/app.module.ts | 127 +--
.../src/app/dashboard/appbar.component.html | 50 +-
.../src/app/dashboard/appbar.component.scss | 72 +-
.../node/src/app/dashboard/appbar.component.ts | 12 +-
.../src/app/dashboard/apptab.component.html | 11 +-
.../src/app/dashboard/apptab.component.scss | 30 +-
.../node/src/app/dashboard/apptab.component.ts | 11 +-
.../metadata/codemirror-metadata.component.scss | 27 -
.../metadata/codemirror-metadata.component.ts | 244 -----
.../dataset-create-dialog.component.html | 14 -
.../dataset-create-dialog.component.scss | 18 -
.../dataset-drop-dialog.component.html | 26 -
.../dataset-drop-dialog.component.scss | 18 -
.../datasets-collection/datasets.component.html | 112 ---
.../datasets-collection/datasets.component.scss | 415 ---------
.../datasets-collection/datasets.component.ts | 231 -----
.../datatype-create-dialog.component.html | 14 -
.../datatype-create-dialog.component.scss | 18 -
.../datatype-drop-dialog.component.html | 26 -
.../datatype-drop-dialog.component.scss | 18 -
.../datatypes.component.html | 70 --
.../datatypes.component.scss | 267 ------
.../datatypes-collection/datatypes.component.ts | 220 -----
.../dataverses-create-dialog.component.html | 27 -
.../dataverses-create-dialog.component.scss | 18 -
.../dataverses-drop-dialog.component.html | 26 -
.../dataverses-drop-dialog.component.scss | 18 -
.../dataverses.component.html | 77 --
.../dataverses.component.scss | 259 ------
.../dataverses.component.ts | 234 -----
.../index-create-dialog.component.html | 14 -
.../index-create-dialog.component.scss | 18 -
.../index-drop-dialog.component.html | 26 -
.../index-drop-dialog.component.scss | 18 -
.../indexes-collection/indexes.component.html | 94 --
.../indexes-collection/indexes.component.scss | 398 --------
.../indexes-collection/indexes.component.ts | 230 -----
.../metadata/input-metadata.component.html | 31 -
.../metadata/input-metadata.component.scss | 78 --
.../metadata/input-metadata.component.ts | 111 ---
.../metadata/metadata-container.component.html | 36 -
.../metadata/metadata-container.component.scss | 56 --
.../metadata/metadata-container.component.ts | 41 -
.../dashboard/query/codemirror.component.scss | 23 -
.../app/dashboard/query/codemirror.component.ts | 237 -----
.../app/dashboard/query/input.component.html | 61 +-
.../app/dashboard/query/input.component.scss | 131 +--
.../src/app/dashboard/query/input.component.ts | 416 +++++++--
.../query/metadata-inspector.component.html | 22 +
.../query/metadata-inspector.component.scss | 30 +
.../app/dashboard/query/metadata.component.html | 81 +-
.../app/dashboard/query/metadata.component.scss | 123 ++-
.../app/dashboard/query/metadata.component.ts | 331 +++----
.../src/app/dashboard/query/ouput.component.ts | 278 ------
.../app/dashboard/query/output.component.html | 66 +-
.../app/dashboard/query/output.component.scss | 161 +---
.../src/app/dashboard/query/output.component.ts | 91 ++
.../query/plan-node-svg.component.html | 81 ++
.../query/plan-node-svg.component.scss | 230 +++++
.../dashboard/query/plan-node-svg.component.ts | 196 ++++
.../dashboard/query/plan-view.component.html | 37 +
.../dashboard/query/plan-view.component.scss | 98 ++
.../app/dashboard/query/plan-view.component.ts | 113 +++
.../query/query-container.component.html | 18 +-
.../query/query-container.component.scss | 57 +-
.../query/query-container.component.ts | 73 +-
.../dashboard/query/tree-node.component.html | 40 +
.../dashboard/query/tree-node.component.scss | 63 ++
.../app/dashboard/query/tree-node.component.ts | 104 +++
.../dashboard/query/tree-view.component.html | 62 ++
.../dashboard/query/tree-view.component.scss | 141 +++
.../app/dashboard/query/tree-view.component.ts | 332 +++++++
.../asterix-dashboard/src/node/src/app/db.ts | 23 -
.../src/node/src/app/material.module.ts | 125 +--
.../node/src/app/shared/actions/app.actions.ts | 22 +-
.../src/app/shared/actions/dataset.actions.ts | 77 +-
.../src/app/shared/actions/datatype.actions.ts | 71 +-
.../src/app/shared/actions/dataverse.actions.ts | 79 +-
.../src/app/shared/actions/index.actions.ts | 71 +-
.../src/app/shared/actions/metadata.actions.ts | 46 -
.../src/app/shared/actions/query.actions.ts | 69 +-
.../node/src/app/shared/effects/app.effects.ts | 24 +
.../src/app/shared/effects/dataset.effects.ts | 22 +-
.../src/app/shared/effects/datatype.effects.ts | 69 +-
.../src/app/shared/effects/dataverse.effects.ts | 34 +-
.../src/app/shared/effects/index.effects.ts | 67 +-
.../src/app/shared/effects/metadata.effects.ts | 41 -
.../src/app/shared/effects/query.effects.ts | 51 +-
.../src/app/shared/models/asterixDB.model.ts | 112 ---
.../src/node/src/app/shared/pipes/keys.pipe.ts | 25 -
.../app/shared/pipes/objectArrayType.pipe.ts | 23 -
.../src/app/shared/pipes/objectType.pipe.ts | 21 -
.../node/src/app/shared/reducers/app.reducer.ts | 77 +-
.../src/app/shared/reducers/dataset.reducer.ts | 291 +++---
.../src/app/shared/reducers/datatype.reducer.ts | 255 +++---
.../app/shared/reducers/dataverse.reducer.ts | 272 +++---
.../src/app/shared/reducers/index.reducer.ts | 252 +++--
.../src/node/src/app/shared/reducers/index.ts | 33 +-
.../src/app/shared/reducers/metadata.reducer.ts | 56 --
.../shared/reducers/query-metadata.reducer.ts | 123 ++-
.../src/app/shared/reducers/query.reducer.ts | 172 ++--
.../src/app/shared/services/app-core.service.ts | 38 -
.../shared/services/async-metadata.service.ts | 120 ---
.../app/shared/services/async-query.service.ts | 351 +++----
.../src/node/src/assets/feather.png | Bin 0 -> 138140 bytes
.../src/node/src/assets/tree.svg | 16 +
.../node/src/environments/environment.prod.ts | 2 +-
.../src/node/src/environments/environment.ts | 2 +-
.../asterix-dashboard/src/node/src/index.html | 14 +-
.../asterix-dashboard/src/node/src/main.scss | 10 +-
.../asterix-dashboard/src/node/src/main.ts | 4 +-
.../asterix-dashboard/src/node/src/polyfills.ts | 2 +-
.../src/node/src/styles/_constants.scss | 4 +-
.../src/node/src/styles/_general.scss | 81 +-
.../asterix-dashboard/src/node/src/test.ts | 6 +-
.../src/node/src/tsconfig.app.json | 24 +-
.../src/node/src/tsconfig.spec.json | 37 +-
.../asterix-dashboard/src/node/src/typings.d.ts | 4 +-
.../asterix-dashboard/src/node/tslint.json | 1 -
.../asterix-doc/src/site/markdown/install.md | 911 -------------------
asterixdb/asterix-doc/src/site/markdown/yarn.md | 255 ------
asterixdb/asterix-doc/src/site/site.xml | 2 -
asterixdb/asterix-external-data/pom.xml | 23 +
.../main/opt/local/bin/start-sample-cluster.sh | 2 +-
asterixdb/src/main/assembly/source.xml | 2 +-
.../licenses/templates/3rdpartylicenses.txt | 509 ++++++-----
hyracks-fullstack/src/main/assembly/source.xml | 2 +-
136 files changed, 4615 insertions(+), 8405 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/adaff3ce/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
----------------------------------------------------------------------
diff --cc asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
index a32f8be,29da286..765ba9c
--- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
+++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/QueryServiceServlet.java
@@@ -544,15 -520,13 +545,16 @@@ public class QueryServiceServlet extend
if (optionalParamProvider != null) {
optionalParams = optionalParamProvider.apply(request);
}
+ Map<String, byte[]> statementParams = org.apache.asterix.app.translator.RequestParameters
+ .serializeParameterValues(param.getStatementParams());
// CORS
- response.setHeader("Access-Control-Allow-Origin",
- "http://" + hostName + ":" + appCtx.getExternalProperties().getQueryWebInterfacePort());
+ if (request.getHeader("Origin") != null) {
+ response.setHeader("Access-Control-Allow-Origin", request.getHeader("Origin"));
+ }
response.setHeader("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept");
response.setStatus(execution.getHttpStatus());
- executeStatement(statementsText, sessionOutput, resultProperties, stats, param, execution, optionalParams);
+ executeStatement(statementsText, sessionOutput, resultProperties, stats, param, execution, optionalParams,
+ statementParams);
if (ResultDelivery.IMMEDIATE == delivery || ResultDelivery.DEFERRED == delivery) {
ResultUtil.printStatus(sessionOutput, execution.getResultStatus());
}
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/adaff3ce/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/adaff3ce/asterixdb/asterix-external-data/pom.xml
----------------------------------------------------------------------
diff --cc asterixdb/asterix-external-data/pom.xml
index 719fc79,1981c18..a73ac92
--- a/asterixdb/asterix-external-data/pom.xml
+++ b/asterixdb/asterix-external-data/pom.xml
@@@ -397,10 -408,17 +408,22 @@@
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>javax.activation</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>com.esri.geometry</groupId>
+ <artifactId>esri-geometry-api</artifactId>
+ <version>2.0.0</version>
+ </dependency>
</dependencies>
</project>
http://git-wip-us.apache.org/repos/asf/asterixdb/blob/adaff3ce/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
----------------------------------------------------------------------
diff --cc asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
index d1699dd,51d25cb..e337cb0
--- a/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
+++ b/asterixdb/asterix-server/src/main/opt/local/bin/start-sample-cluster.sh
@@@ -39,54 -39,7 +39,54 @@@ if [ -z "$JAVA_HOME" -a -x /usr/libexec
export JAVA_HOME
fi
+# OS specific support. $var _must_ be set to either true or false.
+cygwin=false;
+darwin=false;
+case "`uname`" in
+ CYGWIN*) cygwin=true ;;
+ Darwin*) darwin=true
+ if [ -z "$JAVA_VERSION" ] ; then
+ JAVA_VERSION="CurrentJDK"
+ else
+ echo "Using Java version: $JAVA_VERSION"
+ fi
+ if [ -z "$JAVA_HOME" ]; then
+ if [ -x "/usr/libexec/java_home" ]; then
+ JAVA_HOME=`/usr/libexec/java_home`
+ else
+ JAVA_HOME=/System/Library/Frameworks/JavaVM.framework/Versions/${JAVA_VERSION}/Home
+ fi
+ fi
+ ;;
+esac
+
+if [ -z "$JAVA_HOME" ] ; then
+ if [ -r /etc/gentoo-release ] ; then
+ JAVA_HOME=`java-config --jre-home`
+ fi
+fi
+
+# For Cygwin, ensure paths are in UNIX format before anything is touched
+if $cygwin ; then
+ [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+ [ -n "$CLASSPATH" ] && CLASSPATH=`cygpath --path --unix "$CLASSPATH"`
+fi
+
+# If a specific java binary isn't specified search for the standard 'java' binary
+if [ -z "$JAVACMD" ] ; then
+ if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ else
+ JAVACMD=`which java`
+ fi
+fi
+
- export JAVA_VERSION=$(java -version 2>&1 | head -1 | awk '{ print $NF }' | tr -d '"')
+ export JAVA_VERSION=$(java -version 2>&1 | head -1 | awk '{ print $3 }' | tr -d '"')
case $JAVA_VERSION in
1.8*|1.9*|10*|11*)
;;