You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@asterixdb.apache.org by ti...@apache.org on 2016/02/10 05:59:25 UTC
[1/3] incubator-asterixdb git commit: IPrinters and IAWriters throw
HyracksDataException
Repository: incubator-asterixdb
Updated Branches:
refs/heads/master 6084e3b21 -> a1c45ff45
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AYearMonthDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AYearMonthDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AYearMonthDurationPrinter.java
index 8f7c86b..2620afc 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AYearMonthDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AYearMonthDurationPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AYearMonthDurationPrinter implements IPrinter {
@@ -32,14 +32,14 @@ public class AYearMonthDurationPrinter implements IPrinter {
* @see org.apache.hyracks.algebricks.data.IPrinter#init()
*/
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
/* (non-Javadoc)
* @see org.apache.hyracks.algebricks.data.IPrinter#print(byte[], int, int, java.io.PrintStream)
*/
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int months = AInt32SerializerDeserializer.getInt(b, s + 1);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java
index 70a5d1c..74f3353 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABinaryHexPrinter.java
@@ -22,8 +22,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
import org.apache.hyracks.util.bytes.HexPrinter;
@@ -34,12 +34,11 @@ public class ABinaryHexPrinter implements IPrinter {
public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int validLength = ByteArrayPointable.getContentLength(b, s + 1);
int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength);
try {
@@ -47,7 +46,7 @@ public class ABinaryHexPrinter implements IPrinter {
HexPrinter.printHexString(b, start, validLength, ps);
ps.print("\"");
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABooleanPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABooleanPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABooleanPrinter.java
index 1ea3195..2b9471f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABooleanPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ABooleanPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ABooleanPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ABooleanPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ABooleanSerializerDeserializer.getBoolean(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ACirclePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ACirclePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ACirclePrinter.java
index c7f179b..eb42de6 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ACirclePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ACirclePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ACirclePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ACirclePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"circle\": [ { \"point\": [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java
index 7d0ce75..c9a2beb 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADatePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADatePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADatePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"date\": \"");
PrintTools.printDateString(b, s, l, ps);
ps.print("\" }");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java
index 7195edd..78f75d8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADateTimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADateTimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADateTimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"datetime\": \"");
PrintTools.printDateTimeString(b, s, l, ps);
ps.print("\" }");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java
index d376e10..4730cd9 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADayTimeDurationPrinter.java
@@ -21,20 +21,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADayTimeDurationPrinter implements IPrinter {
public static final ADayTimeDurationPrinter INSTANCE = new ADayTimeDurationPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"day-time-duration\": ");
PrintTools.printDayTimeDurationString(b, s, l, ps);
ps.print("}");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinter.java
index 8fcf64d..7d8d3de 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADoublePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADoublePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADoublePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java
index 248490a..3b5a1a2 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ADurationPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADurationPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADurationPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"duration\": \"");
PrintTools.printDurationString(b, s, l, ps);
ps.print("\" }");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinter.java
index 6954282..8f1ad37 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AFloatPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AFloatPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class AFloatPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(AFloatSerializerDeserializer.getFloat(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt16Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt16Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt16Printer.java
index 7b09ec8..a791cf0 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt16Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt16Printer.java
@@ -21,19 +21,18 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt16Printer implements IPrinter {
public static final AInt16Printer INSTANCE = new AInt16Printer();
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short i = AInt16SerializerDeserializer.getShort(b, s + 1);
ps.print("{ \"int16\": ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt32Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt32Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt32Printer.java
index a757a35..437208b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt32Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt32Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt32Printer implements IPrinter {
@@ -30,11 +30,10 @@ public class AInt32Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int d = AInt32SerializerDeserializer.getInt(b, s + 1);
ps.print("{ \"int32\": ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt64Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt64Printer.java
index f01a5d5..f77ab29 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt64Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt64Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt64Printer implements IPrinter {
public static final AInt64Printer INSTANCE = new AInt64Printer();
@@ -32,7 +32,7 @@ public class AInt64Printer implements IPrinter {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
long d = AInt64SerializerDeserializer.getLong(b, s + 1);
ps.print("{ \"int64\": ");
ps.print(d);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt8Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt8Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt8Printer.java
index a1afc3f..f4fa7d8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt8Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AInt8Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt8Printer implements IPrinter {
@@ -30,11 +30,10 @@ public class AInt8Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
byte o = AInt8SerializerDeserializer.getByte(b, s + 1);
ps.print("{ \"int8\": ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AIntervalPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AIntervalPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AIntervalPrinter.java
index 84bf23c..d955d90 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AIntervalPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AIntervalPrinter.java
@@ -26,8 +26,8 @@ import org.apache.asterix.dataflow.data.nontagged.printers.adm.ATimePrinter;
import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AIntervalPrinter implements IPrinter {
@@ -37,14 +37,14 @@ public class AIntervalPrinter implements IPrinter {
* @see org.apache.hyracks.algebricks.data.IPrinter#init()
*/
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
/* (non-Javadoc)
* @see org.apache.hyracks.algebricks.data.IPrinter#print(byte[], int, int, java.io.PrintStream)
*/
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"interval\": { \"start\": ");
byte typetag = AIntervalSerializerDeserializer.getIntervalTimeType(b, s + 1);
@@ -66,7 +66,7 @@ public class AIntervalPrinter implements IPrinter {
timeInstancePrinter = ADateTimePrinter.INSTANCE;
break;
default:
- throw new AlgebricksException("Unsupport internal time types in interval: " + typetag);
+ throw new HyracksDataException("Unsupport internal time types in interval: " + typetag);
}
timeInstancePrinter.print(b, startOffset, startSize, ps);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ALinePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ALinePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ALinePrinter.java
index 24dd017..8dce1e8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ALinePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ALinePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ALinePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ALinePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"line\": ");
ps.print(" [ { \"point\": [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullPrinter.java
index e3663fc..b3c04e0 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullPrinter.java
@@ -20,8 +20,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullPrinter implements IPrinter {
@@ -29,11 +29,10 @@ public class ANullPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("null");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullableFieldPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullableFieldPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullableFieldPrinterFactory.java
index f05f55c..1d495b1 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullableFieldPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ANullableFieldPrinterFactory.java
@@ -24,9 +24,9 @@ import org.apache.asterix.formats.nontagged.AqlLosslessJSONPrinterFactoryProvide
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.BuiltinType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullableFieldPrinterFactory implements IPrinterFactory {
@@ -45,20 +45,21 @@ public class ANullableFieldPrinterFactory implements IPrinterFactory {
private IPrinter fieldPrinter;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
nullPrinter = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL))
.createPrinter();
- fieldPrinter = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getNullableType()))
- .createPrinter();
+ fieldPrinter = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE
+ .getPrinterFactory(unionType.getNullableType())).createPrinter();
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
fieldPrinter.init();
- if (b[s] == ATypeTag.NULL.serialize())
+ if (b[s] == ATypeTag.NULL.serialize()) {
nullPrinter.print(b, s, l, ps);
- else
+ } else {
fieldPrinter.print(b, s, l, ps);
+ }
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinter.java
index 561b5d9..b2975eb 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AObjectPrinter.java
@@ -22,9 +22,9 @@ import java.io.PrintStream;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AObjectPrinter implements IPrinter {
@@ -35,12 +35,11 @@ public class AObjectPrinter implements IPrinter {
private IPrinter unorderedListPrinter = new AUnorderedlistPrinterFactory(null).createPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(b[s]);
switch (typeTag) {
case INT8: {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java
index 7e4152f..c3d6e76 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AOrderedlistPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.json.lossless.APrintVisitor;
import org.apache.asterix.om.types.AOrderedListType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AOrderedlistPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class AOrderedlistPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
listAccessor.set(b, start, l);
arg.first = ps;
listAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APoint3DPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APoint3DPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APoint3DPrinter.java
index fb21c8d..7d47713 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APoint3DPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APoint3DPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APoint3DPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APoint3DPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"point3d\": [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APointPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APointPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APointPrinter.java
index 8edf6d7..cce6983 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APointPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APointPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APointPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APointPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"point\": [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APolygonPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APolygonPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APolygonPrinter.java
index c94e19e..c1495c4 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APolygonPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/APolygonPrinter.java
@@ -22,8 +22,8 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APolygonPrinter implements IPrinter {
@@ -31,11 +31,10 @@ public class APolygonPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short numberOfPoints = AInt16SerializerDeserializer.getShort(b, s + 1);
s += 3;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java
index c4c1e23..ab52e86 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARecordPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.json.lossless.APrintVisitor;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARecordPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class ARecordPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
recAccessor.set(b, start, l);
arg.first = ps;
recAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARectanglePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARectanglePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARectanglePrinter.java
index 4393650..ce203c3 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARectanglePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ARectanglePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARectanglePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ARectanglePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"rectangle\": [");
ps.print("{ \"point\": [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AStringPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AStringPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AStringPrinter.java
index fdc85be..f1835ad 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AStringPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AStringPrinter.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AStringPrinter implements IPrinter {
@@ -31,15 +31,14 @@ public class AStringPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
try {
PrintTools.writeUTF8StringAsJSON(b, s + 1, l - 1, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java
index e3c85b2..aefb2b0 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/ATimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ATimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ATimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"time\": \"");
PrintTools.printTimeString(b, s, l, ps);
ps.print("\" }");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUUIDPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUUIDPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUUIDPrinter.java
index c36de3a..d20c8ad 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUUIDPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUUIDPrinter.java
@@ -22,19 +22,18 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.om.base.AUUID;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUUIDPrinter implements IPrinter {
public static final AUUIDPrinter INSTANCE = new AUUIDPrinter();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
- @Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
StringBuilder buf = new StringBuilder(AUUID.UUID_CHARS + 2);
buf.append('"');
AUUID.appendLiteralOnly(b, s + 1, buf).append('"');
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java
index 6be1207..a0435c6 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnionPrinterFactory.java
@@ -25,9 +25,9 @@ import org.apache.asterix.formats.nontagged.AqlLosslessJSONPrinterFactoryProvide
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnionPrinterFactory implements IPrinterFactory {
@@ -48,26 +48,27 @@ public class AUnionPrinterFactory implements IPrinterFactory {
private List<IAType> unionList;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
unionList = unionType.getUnionList();
printers = new IPrinter[unionType.getUnionList().size()];
for (int i = 0; i < printers.length; i++) {
- printers[i] = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getUnionList()
- .get(i))).createPrinter();
+ printers[i] = (AqlLosslessJSONPrinterFactoryProvider.INSTANCE
+ .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter();
printers[i].init();
}
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag tag = unionList.get(b[s + 1]).getTypeTag();
- if (tag == ATypeTag.UNION)
+ if (tag == ATypeTag.UNION) {
printers[b[s + 1]].print(b, s + 1, l, ps);
- else {
- if (tag == ATypeTag.ANY)
+ } else {
+ if (tag == ATypeTag.ANY) {
printers[b[s + 1]].print(b, s + 2, l, ps);
- else
+ } else {
printers[b[s + 1]].print(b, s + 1, l, ps);
+ }
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnorderedlistPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnorderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnorderedlistPrinterFactory.java
index cad45e1..c77115b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnorderedlistPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AUnorderedlistPrinterFactory.java
@@ -27,10 +27,10 @@ import org.apache.asterix.om.pointables.printer.json.lossless.APrintVisitor;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnorderedlistPrinterFactory implements IPrinterFactory {
@@ -45,8 +45,8 @@ public class AUnorderedlistPrinterFactory implements IPrinterFactory {
public IPrinter createPrinter() {
PointableAllocator allocator = new PointableAllocator();
- final IAType inputType = unorderedlistType == null ? DefaultOpenFieldType
- .getDefaultOpenFieldType(ATypeTag.UNORDEREDLIST) : unorderedlistType;
+ final IAType inputType = unorderedlistType == null
+ ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.UNORDEREDLIST) : unorderedlistType;
final IVisitablePointable listAccessor = allocator.allocateListValue(inputType);
final APrintVisitor printVisitor = new APrintVisitor();
final Pair<PrintStream, ATypeTag> arg = new Pair<PrintStream, ATypeTag>(null, null);
@@ -54,18 +54,18 @@ public class AUnorderedlistPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
listAccessor.set(b, start, l);
arg.first = ps;
listAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (Exception e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AYearMonthDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AYearMonthDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AYearMonthDurationPrinter.java
index d138678..7e4d176 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AYearMonthDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/lossless/AYearMonthDurationPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.lossless;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AYearMonthDurationPrinter implements IPrinter {
@@ -32,14 +32,14 @@ public class AYearMonthDurationPrinter implements IPrinter {
* @see org.apache.hyracks.algebricks.data.IPrinter#init()
*/
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
/* (non-Javadoc)
* @see org.apache.hyracks.algebricks.data.IPrinter#print(byte[], int, int, java.io.PrintStream)
*/
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int months = AInt32SerializerDeserializer.getInt(b, s + 1);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java
index b51b4a4..c29e18f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java
@@ -66,7 +66,7 @@ public class AqlADMPrinterFactoryProvider implements IPrinterFactoryProvider {
}
@Override
- public IPrinterFactory getPrinterFactory(Object type) throws AlgebricksException {
+ public IPrinterFactory getPrinterFactory(Object type) {
IAType aqlType = (IAType) type;
if (aqlType != null) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCSVPrinterFactoryProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCSVPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCSVPrinterFactoryProvider.java
index 103e3ee..d57445b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCSVPrinterFactoryProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCSVPrinterFactoryProvider.java
@@ -50,6 +50,7 @@ import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.IAType;
import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
import org.apache.hyracks.algebricks.data.IPrinterFactoryProvider;
@@ -61,7 +62,7 @@ public class AqlCSVPrinterFactoryProvider implements IPrinterFactoryProvider {
}
@Override
- public IPrinterFactory getPrinterFactory(Object type) throws AlgebricksException {
+ public IPrinterFactory getPrinterFactory(Object type) {
IAType aqlType = (IAType) type;
if (aqlType != null) {
@@ -113,9 +114,9 @@ public class AqlCSVPrinterFactoryProvider implements IPrinterFactoryProvider {
case RECORD:
return new ARecordPrinterFactory((ARecordType) aqlType);
case ORDEREDLIST:
- throw new AlgebricksException("'Orderedlist' type unsupported for CSV output");
+ throw new NotImplementedException("'Orderedlist' type unsupported for CSV output");
case UNORDEREDLIST:
- throw new AlgebricksException("'Unorderedlist' type unsupported for CSV output");
+ throw new NotImplementedException("'Unorderedlist' type unsupported for CSV output");
case UNION: {
if (((AUnionType) aqlType).isNullableType())
return new ANullableFieldPrinterFactory((AUnionType) aqlType);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCleanJSONPrinterFactoryProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCleanJSONPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCleanJSONPrinterFactoryProvider.java
index 7eff19b..c1eb434 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCleanJSONPrinterFactoryProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCleanJSONPrinterFactoryProvider.java
@@ -66,7 +66,7 @@ public class AqlCleanJSONPrinterFactoryProvider implements IPrinterFactoryProvid
}
@Override
- public IPrinterFactory getPrinterFactory(Object type) throws AlgebricksException {
+ public IPrinterFactory getPrinterFactory(Object type) {
IAType aqlType = (IAType) type;
if (aqlType != null) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlLosslessJSONPrinterFactoryProvider.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlLosslessJSONPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlLosslessJSONPrinterFactoryProvider.java
index c79ecbd..aad912c 100644
--- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlLosslessJSONPrinterFactoryProvider.java
+++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlLosslessJSONPrinterFactoryProvider.java
@@ -66,7 +66,7 @@ public class AqlLosslessJSONPrinterFactoryProvider implements IPrinterFactoryPro
}
@Override
- public IPrinterFactory getPrinterFactory(Object type) throws AlgebricksException {
+ public IPrinterFactory getPrinterFactory(Object type) {
IAType aqlType = (IAType) type;
if (aqlType != null) {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/test/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterTest.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/test/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterTest.java b/asterix-om/src/test/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterTest.java
index 881ad50..4989025 100644
--- a/asterix-om/src/test/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterTest.java
+++ b/asterix-om/src/test/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterTest.java
@@ -28,7 +28,7 @@ import java.util.Arrays;
import javax.xml.bind.DatatypeConverter;
import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryHexPrinter;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
import org.junit.Test;
@@ -42,7 +42,7 @@ public class ABinaryPrinterTest {
return ret;
}
- public static void testOneInputString(String input) throws AlgebricksException {
+ public static void testOneInputString(String input) throws HyracksDataException {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
PrintStream ps = new PrintStream(baos);
[3/3] incubator-asterixdb git commit: IPrinters and IAWriters throw
HyracksDataException
Posted by ti...@apache.org.
IPrinters and IAWriters throw HyracksDataException
instead of AlgebricksException (which should be used at compile-time)
Change-Id: I39b3c8bbe3935255afffc49ce8847db66b4abeb1
Reviewed-on: https://asterix-gerrit.ics.uci.edu/612
Tested-by: Jenkins <je...@fulliautomatix.ics.uci.edu>
Reviewed-by: Yingyi Bu <bu...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/commit/a1c45ff4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/tree/a1c45ff4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/diff/a1c45ff4
Branch: refs/heads/master
Commit: a1c45ff4569a063b964f3cc69078f516ca612bcd
Parents: 6084e3b
Author: Till Westmann <ti...@apache.org>
Authored: Tue Feb 9 16:05:07 2016 -0800
Committer: Till Westmann <ti...@apache.org>
Committed: Tue Feb 9 20:54:00 2016 -0800
----------------------------------------------------------------------
.../data/nontagged/printers/PrintTools.java | 23 +++++++++---------
.../printers/adm/ABinaryBase64Printer.java | 8 +++----
.../printers/adm/ABinaryHexPrinter.java | 8 +++----
.../nontagged/printers/adm/ABooleanPrinter.java | 5 ++--
.../nontagged/printers/adm/ACirclePrinter.java | 5 ++--
.../nontagged/printers/adm/ADatePrinter.java | 5 ++--
.../printers/adm/ADateTimePrinter.java | 5 ++--
.../printers/adm/ADayTimeDurationPrinter.java | 7 +++---
.../nontagged/printers/adm/ADoublePrinter.java | 5 ++--
.../printers/adm/ADurationPrinter.java | 5 ++--
.../nontagged/printers/adm/AFloatPrinter.java | 5 ++--
.../nontagged/printers/adm/AInt16Printer.java | 7 +++---
.../nontagged/printers/adm/AInt32Printer.java | 6 ++---
.../nontagged/printers/adm/AInt64Printer.java | 7 +++---
.../nontagged/printers/adm/AInt8Printer.java | 7 +++---
.../printers/adm/AIntervalPrinter.java | 8 +++----
.../nontagged/printers/adm/ALinePrinter.java | 5 ++--
.../nontagged/printers/adm/ANullPrinter.java | 5 ++--
.../adm/ANullableFieldPrinterFactory.java | 14 ++++++-----
.../nontagged/printers/adm/AObjectPrinter.java | 7 +++---
.../adm/AOrderedlistPrinterFactory.java | 11 +++++----
.../nontagged/printers/adm/APoint3DPrinter.java | 5 ++--
.../nontagged/printers/adm/APointPrinter.java | 5 ++--
.../nontagged/printers/adm/APolygonPrinter.java | 5 ++--
.../printers/adm/ARecordPrinterFactory.java | 11 +++++----
.../printers/adm/ARectanglePrinter.java | 5 ++--
.../nontagged/printers/adm/AStringPrinter.java | 7 +++---
.../nontagged/printers/adm/ATimePrinter.java | 5 ++--
.../nontagged/printers/adm/AUUIDPrinter.java | 6 ++---
.../printers/adm/AUnionPrinterFactory.java | 15 ++++++------
.../adm/AUnorderedlistPrinterFactory.java | 14 +++++------
.../printers/adm/AYearMonthDurationPrinter.java | 8 +++----
.../adm/ShortWithoutTypeInfoPrinter.java | 7 +++---
.../printers/csv/ABinaryHexPrinter.java | 9 ++++---
.../nontagged/printers/csv/ABooleanPrinter.java | 5 ++--
.../nontagged/printers/csv/ACirclePrinter.java | 5 ++--
.../nontagged/printers/csv/ADatePrinter.java | 5 ++--
.../printers/csv/ADateTimePrinter.java | 5 ++--
.../printers/csv/ADayTimeDurationPrinter.java | 7 +++---
.../nontagged/printers/csv/ADoublePrinter.java | 5 ++--
.../printers/csv/ADurationPrinter.java | 5 ++--
.../nontagged/printers/csv/AFloatPrinter.java | 5 ++--
.../nontagged/printers/csv/AInt16Printer.java | 5 ++--
.../nontagged/printers/csv/AInt32Printer.java | 5 ++--
.../nontagged/printers/csv/AInt64Printer.java | 4 ++--
.../nontagged/printers/csv/AInt8Printer.java | 5 ++--
.../printers/csv/AIntervalPrinter.java | 8 +++----
.../nontagged/printers/csv/ALinePrinter.java | 5 ++--
.../nontagged/printers/csv/ANullPrinter.java | 5 ++--
.../csv/ANullableFieldPrinterFactory.java | 11 +++++----
.../nontagged/printers/csv/AObjectPrinter.java | 7 +++---
.../nontagged/printers/csv/APoint3DPrinter.java | 5 ++--
.../nontagged/printers/csv/APointPrinter.java | 5 ++--
.../nontagged/printers/csv/APolygonPrinter.java | 5 ++--
.../printers/csv/ARecordPrinterFactory.java | 11 +++++----
.../printers/csv/ARectanglePrinter.java | 5 ++--
.../nontagged/printers/csv/AStringPrinter.java | 7 +++---
.../nontagged/printers/csv/ATimePrinter.java | 5 ++--
.../nontagged/printers/csv/AUUIDPrinter.java | 6 ++---
.../printers/csv/AUnionPrinterFactory.java | 19 ++++++++-------
.../printers/csv/AYearMonthDurationPrinter.java | 6 ++---
.../printers/json/clean/ABinaryHexPrinter.java | 9 ++++---
.../printers/json/clean/ABooleanPrinter.java | 5 ++--
.../printers/json/clean/ACirclePrinter.java | 5 ++--
.../printers/json/clean/ADatePrinter.java | 5 ++--
.../printers/json/clean/ADateTimePrinter.java | 5 ++--
.../json/clean/ADayTimeDurationPrinter.java | 7 +++---
.../printers/json/clean/ADoublePrinter.java | 5 ++--
.../printers/json/clean/ADurationPrinter.java | 5 ++--
.../printers/json/clean/AFloatPrinter.java | 5 ++--
.../printers/json/clean/AInt16Printer.java | 5 ++--
.../printers/json/clean/AInt32Printer.java | 5 ++--
.../printers/json/clean/AInt64Printer.java | 4 ++--
.../printers/json/clean/AInt8Printer.java | 5 ++--
.../printers/json/clean/AIntervalPrinter.java | 8 +++----
.../printers/json/clean/ALinePrinter.java | 5 ++--
.../printers/json/clean/ANullPrinter.java | 5 ++--
.../clean/ANullableFieldPrinterFactory.java | 19 ++++++++-------
.../printers/json/clean/AObjectPrinter.java | 7 +++---
.../json/clean/AOrderedlistPrinterFactory.java | 11 +++++----
.../printers/json/clean/APoint3DPrinter.java | 5 ++--
.../printers/json/clean/APointPrinter.java | 5 ++--
.../printers/json/clean/APolygonPrinter.java | 5 ++--
.../json/clean/ARecordPrinterFactory.java | 11 +++++----
.../printers/json/clean/ARectanglePrinter.java | 5 ++--
.../printers/json/clean/AStringPrinter.java | 7 +++---
.../printers/json/clean/ATimePrinter.java | 5 ++--
.../printers/json/clean/AUUIDPrinter.java | 6 ++---
.../json/clean/AUnionPrinterFactory.java | 25 ++++++++++----------
.../clean/AUnorderedlistPrinterFactory.java | 14 +++++------
.../json/clean/AYearMonthDurationPrinter.java | 6 ++---
.../json/lossless/ABinaryHexPrinter.java | 9 ++++---
.../printers/json/lossless/ABooleanPrinter.java | 5 ++--
.../printers/json/lossless/ACirclePrinter.java | 5 ++--
.../printers/json/lossless/ADatePrinter.java | 5 ++--
.../json/lossless/ADateTimePrinter.java | 5 ++--
.../json/lossless/ADayTimeDurationPrinter.java | 7 +++---
.../printers/json/lossless/ADoublePrinter.java | 5 ++--
.../json/lossless/ADurationPrinter.java | 5 ++--
.../printers/json/lossless/AFloatPrinter.java | 5 ++--
.../printers/json/lossless/AInt16Printer.java | 5 ++--
.../printers/json/lossless/AInt32Printer.java | 5 ++--
.../printers/json/lossless/AInt64Printer.java | 4 ++--
.../printers/json/lossless/AInt8Printer.java | 5 ++--
.../json/lossless/AIntervalPrinter.java | 8 +++----
.../printers/json/lossless/ALinePrinter.java | 5 ++--
.../printers/json/lossless/ANullPrinter.java | 5 ++--
.../lossless/ANullableFieldPrinterFactory.java | 15 ++++++------
.../printers/json/lossless/AObjectPrinter.java | 7 +++---
.../lossless/AOrderedlistPrinterFactory.java | 11 +++++----
.../printers/json/lossless/APoint3DPrinter.java | 5 ++--
.../printers/json/lossless/APointPrinter.java | 5 ++--
.../printers/json/lossless/APolygonPrinter.java | 5 ++--
.../json/lossless/ARecordPrinterFactory.java | 11 +++++----
.../json/lossless/ARectanglePrinter.java | 5 ++--
.../printers/json/lossless/AStringPrinter.java | 7 +++---
.../printers/json/lossless/ATimePrinter.java | 5 ++--
.../printers/json/lossless/AUUIDPrinter.java | 7 +++---
.../json/lossless/AUnionPrinterFactory.java | 19 ++++++++-------
.../lossless/AUnorderedlistPrinterFactory.java | 14 +++++------
.../lossless/AYearMonthDurationPrinter.java | 6 ++---
.../nontagged/AqlADMPrinterFactoryProvider.java | 2 +-
.../nontagged/AqlCSVPrinterFactoryProvider.java | 7 +++---
.../AqlCleanJSONPrinterFactoryProvider.java | 2 +-
.../AqlLosslessJSONPrinterFactoryProvider.java | 2 +-
.../nontagged/printers/ABinaryPrinterTest.java | 4 ++--
126 files changed, 404 insertions(+), 473 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java
index b31c962..7dfb84d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java
@@ -25,8 +25,8 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.util.bytes.HexPrinter;
import org.apache.hyracks.util.string.UTF8StringUtil;
@@ -35,30 +35,29 @@ public class PrintTools {
private static final GregorianCalendarSystem gCalInstance = GregorianCalendarSystem.getInstance();
private static long CHRONON_OF_DAY = 24 * 60 * 60 * 1000;
- public static void printDateString(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public static void printDateString(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
long chrononTime = AInt32SerializerDeserializer.getInt(b, s + 1) * CHRONON_OF_DAY;
try {
gCalInstance.getExtendStringRepUntilField(chrononTime, 0, ps, GregorianCalendarSystem.Fields.YEAR,
GregorianCalendarSystem.Fields.DAY, false);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
- public static void printDateTimeString(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public static void printDateTimeString(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
long chrononTime = AInt64SerializerDeserializer.getLong(b, s + 1);
try {
gCalInstance.getExtendStringRepUntilField(chrononTime, 0, ps, GregorianCalendarSystem.Fields.YEAR,
GregorianCalendarSystem.Fields.MILLISECOND, true);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
-
}
- public static void printDayTimeDurationString(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public static void printDayTimeDurationString(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
boolean positive = true;
long milliseconds = AInt64SerializerDeserializer.getLong(b, s + 1);
@@ -105,11 +104,11 @@ public class PrintTools {
ps.print("S");
}
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
- public static void printDurationString(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public static void printDurationString(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
boolean positive = true;
int months = AInt32SerializerDeserializer.getInt(b, s + 1);
long milliseconds = AInt64SerializerDeserializer.getLong(b, s + 5);
@@ -168,18 +167,18 @@ public class PrintTools {
ps.print("S");
}
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
- public static void printTimeString(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public static void printTimeString(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int time = AInt32SerializerDeserializer.getInt(b, s + 1);
try {
gCalInstance.getExtendStringRepUntilField(time, 0, ps, GregorianCalendarSystem.Fields.HOUR,
GregorianCalendarSystem.Fields.MILLISECOND, true);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java
index 01c2202..0d02394 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java
@@ -22,8 +22,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
import org.apache.hyracks.util.bytes.Base64Printer;
@@ -34,11 +34,11 @@ public class ABinaryBase64Printer implements IPrinter {
public static final ABinaryBase64Printer INSTANCE = new ABinaryBase64Printer();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int validLength = ByteArrayPointable.getContentLength(b, s + 1);
int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength);
try {
@@ -46,7 +46,7 @@ public class ABinaryBase64Printer implements IPrinter {
Base64Printer.printBase64Binary(b, start, validLength, ps);
ps.print("\")");
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java
index a997be4..5e353c1 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java
@@ -22,8 +22,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
import org.apache.hyracks.util.bytes.HexPrinter;
@@ -34,11 +34,11 @@ public class ABinaryHexPrinter implements IPrinter {
public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int validLength = ByteArrayPointable.getContentLength(b, s + 1);
int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength);
try {
@@ -46,7 +46,7 @@ public class ABinaryHexPrinter implements IPrinter {
HexPrinter.printHexString(b, start, validLength, ps);
ps.print("\")");
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java
index 10c2717..64ee37b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ABooleanPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ABooleanPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ABooleanSerializerDeserializer.getBoolean(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java
index ff30c0a..f3839ef 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ACirclePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ACirclePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("circle(\"");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(",");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java
index cedecff..63f9994 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADatePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADatePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("date(\"");
PrintTools.printDateString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java
index 54381f5..e85dad2 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADateTimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADateTimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("datetime(\"");
PrintTools.printDateTimeString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java
index 77a5a90..36a7711 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java
@@ -21,20 +21,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADayTimeDurationPrinter implements IPrinter {
public static final ADayTimeDurationPrinter INSTANCE = new ADayTimeDurationPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("day-time-duration(\"");
PrintTools.printDayTimeDurationString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java
index a94723f..5fe8de9 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADoublePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADoublePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1) + "d");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java
index 0d329a6..c8cb76d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADurationPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADurationPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("duration(\"");
PrintTools.printDurationString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java
index e5f2861..ee552b9 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AFloatPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class AFloatPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(AFloatSerializerDeserializer.getFloat(b, s + 1) + "f");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java
index ea1c21a..7cbd951 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt16Printer implements IPrinter {
@@ -34,17 +34,16 @@ public class AInt16Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short i = AInt16SerializerDeserializer.getShort(b, s + 1);
try {
WriteValueTools.writeInt(i, ps);
WriteValueTools.writeUTF8StringNoQuotes(SUFFIX_STRING, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java
index 4ad745f..cc56880 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt32Printer implements IPrinter {
@@ -37,13 +37,13 @@ public class AInt32Printer implements IPrinter {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int d = AInt32SerializerDeserializer.getInt(b, s + 1);
try {
WriteValueTools.writeInt(d, ps);
WriteValueTools.writeUTF8StringNoQuotes(SUFFIX_STRING, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java
index 8401889..2ed8224 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt64Printer implements IPrinter {
@@ -32,16 +32,15 @@ public class AInt64Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
long d = AInt64SerializerDeserializer.getLong(b, s + 1);
try {
WriteValueTools.writeLong(d, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java
index 415a34e..0cacaac 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java
@@ -22,9 +22,9 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt8Printer implements IPrinter {
@@ -34,17 +34,16 @@ public class AInt8Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
byte o = AInt8SerializerDeserializer.getByte(b, s + 1);
try {
WriteValueTools.writeInt(o, ps);
WriteValueTools.writeUTF8StringNoQuotes(SUFFIX_STRING, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java
index 3c60cd2..f5f59da 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java
@@ -23,8 +23,8 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AIntervalPrinter implements IPrinter {
@@ -34,14 +34,14 @@ public class AIntervalPrinter implements IPrinter {
* @see org.apache.hyracks.algebricks.data.IPrinter#init()
*/
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
/* (non-Javadoc)
* @see org.apache.hyracks.algebricks.data.IPrinter#print(byte[], int, int, java.io.PrintStream)
*/
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("interval(");
byte typetag = AIntervalSerializerDeserializer.getIntervalTimeType(b, s + 1);
@@ -63,7 +63,7 @@ public class AIntervalPrinter implements IPrinter {
timeInstancePrinter = ADateTimePrinter.INSTANCE;
break;
default:
- throw new AlgebricksException("Unsupport internal time types in interval: " + typetag);
+ throw new HyracksDataException("Unsupport internal time types in interval: " + typetag);
}
timeInstancePrinter.print(b, startOffset, startSize, ps);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java
index 734c850..eb855a5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ALinePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ALinePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("line(\"");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(",");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java
index 95de99e..0a3e02e 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java
@@ -20,8 +20,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullPrinter implements IPrinter {
@@ -29,11 +29,10 @@ public class ANullPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("null");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java
index a125956..f063d82 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java
@@ -24,9 +24,9 @@ import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.BuiltinType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullableFieldPrinterFactory implements IPrinterFactory {
@@ -45,19 +45,21 @@ public class ANullableFieldPrinterFactory implements IPrinterFactory {
private IPrinter fieldPrinter;
@Override
- public void init() throws AlgebricksException {
- nullPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)).createPrinter();
+ public void init() throws HyracksDataException {
+ nullPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL))
+ .createPrinter();
fieldPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getNullableType()))
.createPrinter();
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
fieldPrinter.init();
- if (b[s] == ATypeTag.NULL.serialize())
+ if (b[s] == ATypeTag.NULL.serialize()) {
nullPrinter.print(b, s, l, ps);
- else
+ } else {
fieldPrinter.print(b, s, l, ps);
+ }
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java
index 1d2650d..369e250 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java
@@ -22,9 +22,9 @@ import java.io.PrintStream;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AObjectPrinter implements IPrinter {
@@ -35,12 +35,11 @@ public class AObjectPrinter implements IPrinter {
private IPrinter unorderedListPrinter = new AUnorderedlistPrinterFactory(null).createPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(b[s]);
switch (typeTag) {
case INT8: {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java
index 2ddd652..7e8864f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.adm.APrintVisitor;
import org.apache.asterix.om.types.AOrderedListType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AOrderedlistPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class AOrderedlistPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
listAccessor.set(b, start, l);
arg.first = ps;
listAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java
index ff7b452..7a283d8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APoint3DPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APoint3DPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("point3d(\"");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(",");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java
index 2a2ba08..63bee32 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APointPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APointPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("point(\"");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(",");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java
index c5a7b85..dc7fade 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java
@@ -22,8 +22,8 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APolygonPrinter implements IPrinter {
@@ -31,11 +31,10 @@ public class APolygonPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short numberOfPoints = AInt16SerializerDeserializer.getShort(b, s + 1);
s += 3;
ps.print("polygon(\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java
index 06cce73..7340db3 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.adm.APrintVisitor;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARecordPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class ARecordPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
recAccessor.set(b, start, l);
arg.first = ps;
recAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java
index 2c488ad..c835822 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARectanglePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ARectanglePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("rectangle(\"");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(",");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java
index e53c95f..ac1f660 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AStringPrinter implements IPrinter {
@@ -31,16 +31,15 @@ public class AStringPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
try {
// ADM uses same escape semantics as JSON for strings
PrintTools.writeUTF8StringAsJSON(b, s + 1, l - 1, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java
index 30f5646..e1f1843 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ATimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ATimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("time(\"");
PrintTools.printTimeString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java
index 539b49c..786984f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java
@@ -22,19 +22,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.PrintStream;
import org.apache.asterix.om.base.AUUID;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUUIDPrinter implements IPrinter {
public static final AUUIDPrinter INSTANCE = new AUUIDPrinter();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
StringBuilder buf = new StringBuilder(AUUID.UUID_CHARS + 8);
buf.append("uuid(\"");
AUUID.appendLiteralOnly(b, s + 1, buf).append("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java
index 5d4f450..12baa16 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java
@@ -25,9 +25,9 @@ import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnionPrinterFactory implements IPrinterFactory {
@@ -48,7 +48,7 @@ public class AUnionPrinterFactory implements IPrinterFactory {
private List<IAType> unionList;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
unionList = unionType.getUnionList();
printers = new IPrinter[unionType.getUnionList().size()];
for (int i = 0; i < printers.length; i++) {
@@ -59,15 +59,16 @@ public class AUnionPrinterFactory implements IPrinterFactory {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag tag = unionList.get(b[s + 1]).getTypeTag();
- if (tag == ATypeTag.UNION)
+ if (tag == ATypeTag.UNION) {
printers[b[s + 1]].print(b, s + 1, l, ps);
- else {
- if (tag == ATypeTag.ANY)
+ } else {
+ if (tag == ATypeTag.ANY) {
printers[b[s + 1]].print(b, s + 2, l, ps);
- else
+ } else {
printers[b[s + 1]].print(b, s + 1, l, ps);
+ }
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java
index fa586db..c185881 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java
@@ -27,10 +27,10 @@ import org.apache.asterix.om.pointables.printer.adm.APrintVisitor;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnorderedlistPrinterFactory implements IPrinterFactory {
@@ -45,8 +45,8 @@ public class AUnorderedlistPrinterFactory implements IPrinterFactory {
public IPrinter createPrinter() {
PointableAllocator allocator = new PointableAllocator();
- final IAType inputType = unorderedlistType == null ? DefaultOpenFieldType
- .getDefaultOpenFieldType(ATypeTag.UNORDEREDLIST) : unorderedlistType;
+ final IAType inputType = unorderedlistType == null
+ ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.UNORDEREDLIST) : unorderedlistType;
final IVisitablePointable listAccessor = allocator.allocateListValue(inputType);
final APrintVisitor printVisitor = new APrintVisitor();
final Pair<PrintStream, ATypeTag> arg = new Pair<PrintStream, ATypeTag>(null, null);
@@ -54,18 +54,18 @@ public class AUnorderedlistPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
listAccessor.set(b, start, l);
arg.first = ps;
listAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (Exception e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java
index d91eb17..41cf277 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java
@@ -23,9 +23,9 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
import org.apache.asterix.om.base.temporal.GregorianCalendarSystem;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AYearMonthDurationPrinter implements IPrinter {
@@ -36,14 +36,14 @@ public class AYearMonthDurationPrinter implements IPrinter {
* @see org.apache.hyracks.algebricks.data.IPrinter#init()
*/
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
/* (non-Javadoc)
* @see org.apache.hyracks.algebricks.data.IPrinter#print(byte[], int, int, java.io.PrintStream)
*/
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
boolean positive = true;
int months = AInt32SerializerDeserializer.getInt(b, s + 1);
@@ -72,7 +72,7 @@ public class AYearMonthDurationPrinter implements IPrinter {
}
ps.print("\")");
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java
index ec3ee38..1435d5f 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java
@@ -21,9 +21,9 @@ package org.apache.asterix.dataflow.data.nontagged.printers.adm;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.utils.WriteValueTools;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ShortPointable;
public class ShortWithoutTypeInfoPrinter implements IPrinter {
@@ -32,16 +32,15 @@ public class ShortWithoutTypeInfoPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short d = ShortPointable.getShort(b, s);
try {
WriteValueTools.writeInt((int)d, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java
index 23b5383..707ca70 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABinaryHexPrinter.java
@@ -22,8 +22,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
import org.apache.hyracks.util.bytes.HexPrinter;
@@ -34,18 +34,17 @@ public class ABinaryHexPrinter implements IPrinter {
public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int validLength = ByteArrayPointable.getContentLength(b, s + 1);
int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength);
try {
HexPrinter.printHexString(b, start, validLength, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABooleanPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABooleanPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABooleanPrinter.java
index fe7da39..c95ca34 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABooleanPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ABooleanPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ABooleanPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ABooleanPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ABooleanSerializerDeserializer.getBoolean(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ACirclePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ACirclePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ACirclePrinter.java
index d14a53b..91a9aa9 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ACirclePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ACirclePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ACirclePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ACirclePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"[ [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADatePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADatePrinter.java
index dd06dbc..e21f828 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADatePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADatePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADatePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADatePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDateString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADateTimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADateTimePrinter.java
index e39e813..c5d97d9 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADateTimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADateTimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADateTimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADateTimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDateTimeString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java
index 2eb64f7..6dc819b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADayTimeDurationPrinter.java
@@ -21,20 +21,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADayTimeDurationPrinter implements IPrinter {
public static final ADayTimeDurationPrinter INSTANCE = new ADayTimeDurationPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDayTimeDurationString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinter.java
index f7490cc..f648336 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADoublePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADoublePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADoublePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java
index a764891..dbff71b 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ADurationPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADurationPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADurationPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDurationString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AFloatPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AFloatPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AFloatPrinter.java
index e8bca65..c22ba9e 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AFloatPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AFloatPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AFloatPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class AFloatPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(AFloatSerializerDeserializer.getFloat(b, s + 1));
}
}
\ No newline at end of file
[2/3] incubator-asterixdb git commit: IPrinters and IAWriters throw
HyracksDataException
Posted by ti...@apache.org.
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16Printer.java
index bfa9da7..1349d98 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt16Printer.java
@@ -21,19 +21,18 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt16Printer implements IPrinter {
public static final AInt16Printer INSTANCE = new AInt16Printer();
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short i = AInt16SerializerDeserializer.getShort(b, s + 1);
ps.print(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32Printer.java
index bd4d757..01b6c02 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt32Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt32Printer implements IPrinter {
@@ -30,11 +30,10 @@ public class AInt32Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int d = AInt32SerializerDeserializer.getInt(b, s + 1);
ps.print(d);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64Printer.java
index aa99aa2..5b05275 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt64Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt64Printer implements IPrinter {
public static final AInt64Printer INSTANCE = new AInt64Printer();
@@ -32,7 +32,7 @@ public class AInt64Printer implements IPrinter {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
long d = AInt64SerializerDeserializer.getLong(b, s + 1);
ps.print(d);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8Printer.java
index 1acdf15..3e59811 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AInt8Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt8Printer implements IPrinter {
@@ -30,11 +30,10 @@ public class AInt8Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
byte o = AInt8SerializerDeserializer.getByte(b, s + 1);
ps.print(o);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AIntervalPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AIntervalPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AIntervalPrinter.java
index b9a42ac..ba74790 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AIntervalPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AIntervalPrinter.java
@@ -20,8 +20,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AIntervalPrinter implements IPrinter {
@@ -29,11 +29,11 @@ public class AIntervalPrinter implements IPrinter {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
- throw new AlgebricksException("'Interval' type unsupported for CSV output");
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
+ throw new HyracksDataException("'Interval' type unsupported for CSV output");
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ALinePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ALinePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ALinePrinter.java
index 5241797..a500e58 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ALinePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ALinePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ALinePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ALinePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"[ [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullPrinter.java
index 1182b0a..2acedeb 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullPrinter.java
@@ -20,8 +20,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullPrinter implements IPrinter {
@@ -29,11 +29,10 @@ public class ANullPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("null");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullableFieldPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullableFieldPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullableFieldPrinterFactory.java
index d8969dc..3d76087 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullableFieldPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ANullableFieldPrinterFactory.java
@@ -24,9 +24,9 @@ import org.apache.asterix.formats.nontagged.AqlCSVPrinterFactoryProvider;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.BuiltinType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullableFieldPrinterFactory implements IPrinterFactory {
@@ -45,7 +45,7 @@ public class ANullableFieldPrinterFactory implements IPrinterFactory {
private IPrinter fieldPrinter;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
nullPrinter = (AqlCSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL))
.createPrinter();
fieldPrinter = (AqlCSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getNullableType()))
@@ -53,12 +53,13 @@ public class ANullableFieldPrinterFactory implements IPrinterFactory {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
fieldPrinter.init();
- if (b[s] == ATypeTag.NULL.serialize())
+ if (b[s] == ATypeTag.NULL.serialize()) {
nullPrinter.print(b, s, l, ps);
- else
+ } else {
fieldPrinter.print(b, s, l, ps);
+ }
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinter.java
index 319476f..6587d52 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AObjectPrinter.java
@@ -22,9 +22,9 @@ import java.io.PrintStream;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AObjectPrinter implements IPrinter {
@@ -33,12 +33,11 @@ public class AObjectPrinter implements IPrinter {
private IPrinter recordPrinter = new ARecordPrinterFactory(null).createPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(b[s]);
switch (typeTag) {
case INT8: {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APoint3DPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APoint3DPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APoint3DPrinter.java
index 4ad8da9..296cb41 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APoint3DPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APoint3DPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APoint3DPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APoint3DPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"[");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APointPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APointPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APointPrinter.java
index e3af0f2..bab0ddd 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APointPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APointPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APointPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APointPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"[");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APolygonPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APolygonPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APolygonPrinter.java
index d61d427..493715a 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APolygonPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/APolygonPrinter.java
@@ -22,8 +22,8 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APolygonPrinter implements IPrinter {
@@ -31,11 +31,10 @@ public class APolygonPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short numberOfPoints = AInt16SerializerDeserializer.getShort(b, s + 1);
s += 3;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java
index af4ebec..ad513a5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARecordPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.csv.APrintVisitor;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARecordPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class ARecordPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
recAccessor.set(b, start, l);
arg.first = ps;
recAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java
index cdd232d..07449cf 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ARectanglePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARectanglePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ARectanglePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"[ [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AStringPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AStringPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AStringPrinter.java
index 8c6337e..709929d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AStringPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AStringPrinter.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AStringPrinter implements IPrinter {
@@ -31,15 +31,14 @@ public class AStringPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
try {
PrintTools.writeUTF8StringAsCSV(b, s + 1, l - 1, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java
index b23430d..dfd5501 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/ATimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ATimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ATimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printTimeString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUUIDPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUUIDPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUUIDPrinter.java
index 89f5e31..34998e5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUUIDPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUUIDPrinter.java
@@ -22,19 +22,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.om.base.AUUID;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUUIDPrinter implements IPrinter {
public static final AUUIDPrinter INSTANCE = new AUUIDPrinter();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
StringBuilder buf = new StringBuilder(AUUID.UUID_CHARS + 2);
buf.append('"');
AUUID.appendLiteralOnly(b, s + 1, buf).append('"');
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java
index 34e63c6..6fc691d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AUnionPrinterFactory.java
@@ -25,9 +25,9 @@ import org.apache.asterix.formats.nontagged.AqlCSVPrinterFactoryProvider;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnionPrinterFactory implements IPrinterFactory {
@@ -48,26 +48,27 @@ public class AUnionPrinterFactory implements IPrinterFactory {
private List<IAType> unionList;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
unionList = unionType.getUnionList();
printers = new IPrinter[unionType.getUnionList().size()];
for (int i = 0; i < printers.length; i++) {
- printers[i] = (AqlCSVPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getUnionList()
- .get(i))).createPrinter();
+ printers[i] = (AqlCSVPrinterFactoryProvider.INSTANCE
+ .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter();
printers[i].init();
}
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag tag = unionList.get(b[s + 1]).getTypeTag();
- if (tag == ATypeTag.UNION)
+ if (tag == ATypeTag.UNION) {
printers[b[s + 1]].print(b, s + 1, l, ps);
- else {
- if (tag == ATypeTag.ANY)
+ } else {
+ if (tag == ATypeTag.ANY) {
printers[b[s + 1]].print(b, s + 2, l, ps);
- else
+ } else {
printers[b[s + 1]].print(b, s + 1, l, ps);
+ }
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AYearMonthDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AYearMonthDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AYearMonthDurationPrinter.java
index 567e5ce..497bf3d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AYearMonthDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AYearMonthDurationPrinter.java
@@ -21,19 +21,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.csv;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AYearMonthDurationPrinter implements IPrinter {
public static final AYearMonthDurationPrinter INSTANCE = new AYearMonthDurationPrinter();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int months = AInt32SerializerDeserializer.getInt(b, s + 1);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java
index ee82826..1bbf0f0 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABinaryHexPrinter.java
@@ -22,8 +22,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.IOException;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
import org.apache.hyracks.data.std.primitive.ByteArrayPointable;
import org.apache.hyracks.util.bytes.HexPrinter;
@@ -34,12 +34,11 @@ public class ABinaryHexPrinter implements IPrinter {
public static final ABinaryHexPrinter INSTANCE = new ABinaryHexPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int validLength = ByteArrayPointable.getContentLength(b, s + 1);
int start = s + 1 + ByteArrayPointable.getNumberBytesToStoreMeta(validLength);
@@ -48,7 +47,7 @@ public class ABinaryHexPrinter implements IPrinter {
HexPrinter.printHexString(b, start, validLength, ps);
ps.print("\"");
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABooleanPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABooleanPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABooleanPrinter.java
index 4a67f2a..0f06bbb 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABooleanPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ABooleanPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ABooleanSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ABooleanPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ABooleanPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ABooleanSerializerDeserializer.getBoolean(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ACirclePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ACirclePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ACirclePrinter.java
index b81878a..70b0ff8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ACirclePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ACirclePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ACirclePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ACirclePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("[ [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java
index 4e85b3e..43ee994 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADatePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADatePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADatePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDateString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java
index f340a17..7c1a746 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADateTimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADateTimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADateTimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDateTimeString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java
index 0679f41..d7ce053 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADayTimeDurationPrinter.java
@@ -21,20 +21,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADayTimeDurationPrinter implements IPrinter {
public static final ADayTimeDurationPrinter INSTANCE = new ADayTimeDurationPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDayTimeDurationString(b, s, l, ps);
ps.print("\")");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinter.java
index bab9f01..c652b48 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADoublePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADoublePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADoublePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java
index ed7b3ed..163fd26 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ADurationPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ADurationPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ADurationPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printDurationString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinter.java
index ee9373e..adb2e67 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AFloatPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AFloatSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AFloatPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class AFloatPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print(AFloatSerializerDeserializer.getFloat(b, s + 1));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16Printer.java
index 992f422..57aff95 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt16Printer.java
@@ -21,19 +21,18 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt16Printer implements IPrinter {
public static final AInt16Printer INSTANCE = new AInt16Printer();
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short i = AInt16SerializerDeserializer.getShort(b, s + 1);
ps.print(i);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32Printer.java
index 03a5615..996be35 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt32Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt32SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt32Printer implements IPrinter {
@@ -30,11 +30,10 @@ public class AInt32Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
int d = AInt32SerializerDeserializer.getInt(b, s + 1);
ps.print(d);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64Printer.java
index edff119..564e920 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt64Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt64SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt64Printer implements IPrinter {
public static final AInt64Printer INSTANCE = new AInt64Printer();
@@ -32,7 +32,7 @@ public class AInt64Printer implements IPrinter {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
long d = AInt64SerializerDeserializer.getLong(b, s + 1);
ps.print(d);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8Printer.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8Printer.java
index 7bdc127..2ed1341 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8Printer.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AInt8Printer.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt8SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AInt8Printer implements IPrinter {
@@ -30,11 +30,10 @@ public class AInt8Printer implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
byte o = AInt8SerializerDeserializer.getByte(b, s + 1);
ps.print(o);
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AIntervalPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AIntervalPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AIntervalPrinter.java
index 3f8a647..b5cdbb8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AIntervalPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AIntervalPrinter.java
@@ -26,8 +26,8 @@ import org.apache.asterix.dataflow.data.nontagged.printers.adm.ATimePrinter;
import org.apache.asterix.dataflow.data.nontagged.serde.AIntervalSerializerDeserializer;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AIntervalPrinter implements IPrinter {
@@ -37,14 +37,14 @@ public class AIntervalPrinter implements IPrinter {
* @see org.apache.hyracks.algebricks.data.IPrinter#init()
*/
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
/* (non-Javadoc)
* @see org.apache.hyracks.algebricks.data.IPrinter#print(byte[], int, int, java.io.PrintStream)
*/
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("{ \"interval\": { \"start\": ");
byte typetag = AIntervalSerializerDeserializer.getIntervalTimeType(b, s + 1);
@@ -66,7 +66,7 @@ public class AIntervalPrinter implements IPrinter {
timeInstancePrinter = ADateTimePrinter.INSTANCE;
break;
default:
- throw new AlgebricksException("Unsupport internal time types in interval: " + typetag);
+ throw new HyracksDataException("Unsupport internal time types in interval: " + typetag);
}
timeInstancePrinter.print(b, startOffset, startSize, ps);
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ALinePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ALinePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ALinePrinter.java
index 9927b20..6b3ea36 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ALinePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ALinePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ALinePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ALinePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("[ [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullPrinter.java
index 79dc018..a9d68d5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullPrinter.java
@@ -20,8 +20,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullPrinter implements IPrinter {
@@ -29,11 +29,10 @@ public class ANullPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("null");
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullableFieldPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullableFieldPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullableFieldPrinterFactory.java
index 406a9e4..b1319c8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullableFieldPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ANullableFieldPrinterFactory.java
@@ -18,15 +18,15 @@
*/
package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
+import java.io.PrintStream;
+
import org.apache.asterix.formats.nontagged.AqlCleanJSONPrinterFactoryProvider;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.BuiltinType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
-
-import java.io.PrintStream;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ANullableFieldPrinterFactory implements IPrinterFactory {
@@ -45,20 +45,21 @@ public class ANullableFieldPrinterFactory implements IPrinterFactory {
private IPrinter fieldPrinter;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
nullPrinter = (AqlCleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL))
.createPrinter();
- fieldPrinter = (AqlCleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getNullableType()))
- .createPrinter();
+ fieldPrinter = (AqlCleanJSONPrinterFactoryProvider.INSTANCE
+ .getPrinterFactory(unionType.getNullableType())).createPrinter();
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
fieldPrinter.init();
- if (b[s] == ATypeTag.NULL.serialize())
+ if (b[s] == ATypeTag.NULL.serialize()) {
nullPrinter.print(b, s, l, ps);
- else
+ } else {
fieldPrinter.print(b, s, l, ps);
+ }
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinter.java
index 2d5a8f6..f3fa4a0 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AObjectPrinter.java
@@ -22,9 +22,9 @@ import java.io.PrintStream;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.EnumDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AObjectPrinter implements IPrinter {
@@ -35,12 +35,11 @@ public class AObjectPrinter implements IPrinter {
private IPrinter unorderedListPrinter = new AUnorderedlistPrinterFactory(null).createPrinter();
@Override
- public void init() throws AlgebricksException {
-
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag typeTag = EnumDeserializer.ATYPETAGDESERIALIZER.deserialize(b[s]);
switch (typeTag) {
case INT8: {
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java
index 00d59f6..d911594 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AOrderedlistPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.json.clean.APrintVisitor;
import org.apache.asterix.om.types.AOrderedListType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AOrderedlistPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class AOrderedlistPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
listAccessor.set(b, start, l);
arg.first = ps;
listAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APoint3DPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APoint3DPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APoint3DPrinter.java
index 169c799..4271695 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APoint3DPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APoint3DPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APoint3DPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APoint3DPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("[");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APointPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APointPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APointPrinter.java
index 7cd4eef..1a6b327 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APointPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APointPrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APointPrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class APointPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("[");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APolygonPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APolygonPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APolygonPrinter.java
index 350f214..5e8aea8 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APolygonPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/APolygonPrinter.java
@@ -22,8 +22,8 @@ import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
import org.apache.asterix.dataflow.data.nontagged.serde.AInt16SerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class APolygonPrinter implements IPrinter {
@@ -31,11 +31,10 @@ public class APolygonPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
short numberOfPoints = AInt16SerializerDeserializer.getShort(b, s + 1);
s += 3;
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java
index 0d1e089..bf459e3 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARecordPrinterFactory.java
@@ -20,6 +20,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
+import org.apache.asterix.common.exceptions.AsterixException;
import org.apache.asterix.om.pointables.PointableAllocator;
import org.apache.asterix.om.pointables.base.DefaultOpenFieldType;
import org.apache.asterix.om.pointables.base.IVisitablePointable;
@@ -27,10 +28,10 @@ import org.apache.asterix.om.pointables.printer.json.clean.APrintVisitor;
import org.apache.asterix.om.types.ARecordType;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARecordPrinterFactory implements IPrinterFactory {
@@ -54,18 +55,18 @@ public class ARecordPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
recAccessor.set(b, start, l);
arg.first = ps;
recAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (AsterixException e) {
+ throw new HyracksDataException(e);
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARectanglePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARectanglePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARectanglePrinter.java
index 253d2e4..73a9e5d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARectanglePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ARectanglePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.serde.ADoubleSerializerDeserializer;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ARectanglePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ARectanglePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("[ [");
ps.print(ADoubleSerializerDeserializer.getDouble(b, s + 1));
ps.print(", ");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AStringPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AStringPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AStringPrinter.java
index 04fb8a0..de59073 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AStringPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AStringPrinter.java
@@ -22,8 +22,8 @@ import java.io.IOException;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AStringPrinter implements IPrinter {
@@ -31,15 +31,14 @@ public class AStringPrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
try {
PrintTools.writeUTF8StringAsJSON(b, s + 1, l - 1, ps);
} catch (IOException e) {
- throw new AlgebricksException(e);
+ throw new HyracksDataException(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java
index b65c2da..cda475d 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/ATimePrinter.java
@@ -21,8 +21,8 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class ATimePrinter implements IPrinter {
@@ -30,11 +30,10 @@ public class ATimePrinter implements IPrinter {
@Override
public void init() {
-
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ps.print("\"");
PrintTools.printTimeString(b, s, l, ps);
ps.print("\"");
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUUIDPrinter.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUUIDPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUUIDPrinter.java
index 2a59fe4..3990dd4 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUUIDPrinter.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUUIDPrinter.java
@@ -22,19 +22,19 @@ package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
import java.io.PrintStream;
import org.apache.asterix.om.base.AUUID;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUUIDPrinter implements IPrinter {
public static final AUUIDPrinter INSTANCE = new AUUIDPrinter();
@Override
- public void init() throws AlgebricksException {
+ public void init() {
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
StringBuilder buf = new StringBuilder(AUUID.UUID_CHARS + 2);
buf.append('"');
AUUID.appendLiteralOnly(b, s + 1, buf).append('"');
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java
index e3e835e..d19035e 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnionPrinterFactory.java
@@ -18,16 +18,16 @@
*/
package org.apache.asterix.dataflow.data.nontagged.printers.json.clean;
+import java.io.PrintStream;
+import java.util.List;
+
import org.apache.asterix.formats.nontagged.AqlCleanJSONPrinterFactoryProvider;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnionType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
-
-import java.io.PrintStream;
-import java.util.List;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnionPrinterFactory implements IPrinterFactory {
@@ -48,26 +48,27 @@ public class AUnionPrinterFactory implements IPrinterFactory {
private List<IAType> unionList;
@Override
- public void init() throws AlgebricksException {
+ public void init() throws HyracksDataException {
unionList = unionType.getUnionList();
printers = new IPrinter[unionType.getUnionList().size()];
for (int i = 0; i < printers.length; i++) {
- printers[i] = (AqlCleanJSONPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getUnionList()
- .get(i))).createPrinter();
+ printers[i] = (AqlCleanJSONPrinterFactoryProvider.INSTANCE
+ .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter();
printers[i].init();
}
}
@Override
- public void print(byte[] b, int s, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int s, int l, PrintStream ps) throws HyracksDataException {
ATypeTag tag = unionList.get(b[s + 1]).getTypeTag();
- if (tag == ATypeTag.UNION)
+ if (tag == ATypeTag.UNION) {
printers[b[s + 1]].print(b, s + 1, l, ps);
- else {
- if (tag == ATypeTag.ANY)
+ } else {
+ if (tag == ATypeTag.ANY) {
printers[b[s + 1]].print(b, s + 2, l, ps);
- else
+ } else {
printers[b[s + 1]].print(b, s + 1, l, ps);
+ }
}
}
};
http://git-wip-us.apache.org/repos/asf/incubator-asterixdb/blob/a1c45ff4/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnorderedlistPrinterFactory.java
----------------------------------------------------------------------
diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnorderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnorderedlistPrinterFactory.java
index 8004c75..3c4bcb5 100644
--- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnorderedlistPrinterFactory.java
+++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/clean/AUnorderedlistPrinterFactory.java
@@ -27,10 +27,10 @@ import org.apache.asterix.om.pointables.printer.json.clean.APrintVisitor;
import org.apache.asterix.om.types.ATypeTag;
import org.apache.asterix.om.types.AUnorderedListType;
import org.apache.asterix.om.types.IAType;
-import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException;
import org.apache.hyracks.algebricks.common.utils.Pair;
import org.apache.hyracks.algebricks.data.IPrinter;
import org.apache.hyracks.algebricks.data.IPrinterFactory;
+import org.apache.hyracks.api.exceptions.HyracksDataException;
public class AUnorderedlistPrinterFactory implements IPrinterFactory {
@@ -45,8 +45,8 @@ public class AUnorderedlistPrinterFactory implements IPrinterFactory {
public IPrinter createPrinter() {
PointableAllocator allocator = new PointableAllocator();
- final IAType inputType = unorderedlistType == null ? DefaultOpenFieldType
- .getDefaultOpenFieldType(ATypeTag.UNORDEREDLIST) : unorderedlistType;
+ final IAType inputType = unorderedlistType == null
+ ? DefaultOpenFieldType.getDefaultOpenFieldType(ATypeTag.UNORDEREDLIST) : unorderedlistType;
final IVisitablePointable listAccessor = allocator.allocateListValue(inputType);
final APrintVisitor printVisitor = new APrintVisitor();
final Pair<PrintStream, ATypeTag> arg = new Pair<PrintStream, ATypeTag>(null, null);
@@ -54,18 +54,18 @@ public class AUnorderedlistPrinterFactory implements IPrinterFactory {
return new IPrinter() {
@Override
- public void init() throws AlgebricksException {
+ public void init() {
arg.second = inputType.getTypeTag();
}
@Override
- public void print(byte[] b, int start, int l, PrintStream ps) throws AlgebricksException {
+ public void print(byte[] b, int start, int l, PrintStream ps) throws HyracksDataException {
try {
listAccessor.set(b, start, l);
arg.first = ps;
listAccessor.accept(printVisitor, arg);
- } catch (Exception ioe) {
- throw new AlgebricksException(ioe);
+ } catch (Exception e) {
+ throw new HyracksDataException(e);
}
}
};