[email protected] has uploaded a new change for review. https://asterix-gerrit.ics.uci.edu/3075
Change subject: license issues. ...................................................................... license issues. Change-Id: Icb53688ebe43a47e19659fe131d3955794723971 --- M asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ParseValuesJsonPrintUtils.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java M asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ParseOnlyTest.java M asterixdb/asterix-app/src/test/resources/runtimets/testsuite_parseonly.xml M asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/ParseValues.java 6 files changed, 41 insertions(+), 12 deletions(-) git pull ssh://asterix-gerrit.ics.uci.edu:29418/asterixdb refs/changes/75/3075/1 diff --git a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ParseValuesJsonPrintUtils.java b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ParseValuesJsonPrintUtils.java index 9195c78..4d41e86 100644 --- a/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ParseValuesJsonPrintUtils.java +++ b/asterixdb/asterix-app/src/main/java/org/apache/asterix/api/http/server/ParseValuesJsonPrintUtils.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + package org.apache.asterix.api.http.server; import org.apache.asterix.lang.sqlpp.parser.ParseValues; diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java index e71c2d9..dfe5747 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/ResultExtractor.java @@ -96,7 +96,6 @@ return extract(resultStream, EnumSet.of(ResultField.PARSEVALS)); } - public static String extractHandle(InputStream resultStream) throws Exception { String result = IOUtils.toString(resultStream, StandardCharsets.UTF_8); ObjectNode resultJson = OBJECT_MAPPER.readValue(result, ObjectNode.class); diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java index d4947fe..806eb54 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/common/TestExecutor.java @@ -1213,7 +1213,7 @@ if (DELIVERY_IMMEDIATE.equals(delivery)) { resultStream = executeQueryService(statement, fmt, uri, params, isJsonEncoded, null, isCancellable(reqType)); - switch(reqType){ + switch (reqType) { case METRICS_QUERY_TYPE: resultStream = ResultExtractor.extractMetrics(resultStream); break; @@ -1494,10 +1494,9 @@ final Parameter param = new Parameter(); String name = m.group("name"); if (name.equals("parse")) { - String newname= "parse-only"; + String newname = "parse-only"; param.setName(newname); - } - else { + } else { param.setName(name); } String value = m.group("value"); diff --git a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ParseOnlyTest.java b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ParseOnlyTest.java index 73f98a0..5c42017 100644 --- a/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ParseOnlyTest.java +++ b/asterixdb/asterix-app/src/test/java/org/apache/asterix/test/runtime/ParseOnlyTest.java @@ -18,12 +18,9 @@ */ package org.apache.asterix.test.runtime; - import java.util.Collection; - import org.apache.asterix.test.common.TestExecutor; - import org.apache.asterix.testframework.context.TestCaseContext; @@ -34,12 +31,10 @@ import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameters; - //TODO: eventually dummy test should come here @RunWith(Parameterized.class) public class ParseOnlyTest { - protected static final String TEST_CONFIG_FILE_NAME = "src/main/resources/cc.conf"; diff --git a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_parseonly.xml b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_parseonly.xml index a6d945f..35ba883 100644 --- a/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_parseonly.xml +++ b/asterixdb/asterix-app/src/test/resources/runtimets/testsuite_parseonly.xml @@ -1,7 +1,23 @@ -<?xml version="1.0" encoding="UTF-8"?> <!-- - ! Copyright 2017-2018 Couchbase, Inc. + ! Licensed to the Apache Software Foundation (ASF) under one + ! or more contributor license agreements. See the NOTICE file + ! distributed with this work for additional information + ! regarding copyright ownership. The ASF licenses this file + ! to you under the Apache License, Version 2.0 (the + ! "License"); you may not use this file except in compliance + ! with the License. You may obtain a copy of the License at + ! + ! http://www.apache.org/licenses/LICENSE-2.0 + ! + ! Unless required by applicable law or agreed to in writing, + ! software distributed under the License is distributed on an + ! "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ! KIND, either express or implied. See the License for the + ! specific language governing permissions and limitations + ! under the License. !--> + +<?xml version="1.0" encoding="UTF-8"?> <test-suite xmlns="urn:xml.testframework.asterix.apache.org" ResultOffsetPath="results" QueryOffsetPath="queries" QueryFileExtension=".sqlpp"> <test-group name="parseonly"> diff --git a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/ParseValues.java b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/ParseValues.java index f71359e..266e7d2 100644 --- a/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/ParseValues.java +++ b/asterixdb/asterix-lang-sqlpp/src/main/java/org/apache/asterix/lang/sqlpp/parser/ParseValues.java @@ -28,6 +28,7 @@ public class ParseValues implements Serializable { private Set<VariableExpr> externalVariables; private String extVarsSerialized; + public Set<VariableExpr> getExternalVariables() { return externalVariables; } -- To view, visit https://asterix-gerrit.ics.uci.edu/3075 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icb53688ebe43a47e19659fe131d3955794723971 Gerrit-PatchSet: 1 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: [email protected]
