Chris Hillery has submitted this change and it was merged. Change subject: Move ADM-specific printers and related classes into .adm packages. ......................................................................
Move ADM-specific printers and related classes into .adm packages. Change-Id: I5c37d3b5aad7f286eba1cb8cb5f05ad456a6521b Reviewed-on: https://asterix-gerrit.ics.uci.edu/360 Tested-by: Jenkins <[email protected]> Reviewed-by: Ian Maxon <[email protected]> --- M asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java M asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16PrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32PrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64PrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8PrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinterFactory.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/PrintTools.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java R asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinterFactory.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/csv/AStringPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AObjectPrinter.java M asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AStringPrinter.java M asterix-om/src/main/java/org/apache/asterix/formats/base/IDataFormat.java R asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java M asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlCSVPrinterFactoryProvider.java M asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlJSONPrinterFactoryProvider.java M asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java R asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/AListPrinter.java R asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java R asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/ARecordPrinter.java M asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java M asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/APrintVisitor.java M asterix-om/src/test/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterTest.java M asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/PrintBinaryDescriptor.java M asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java 77 files changed, 161 insertions(+), 160 deletions(-) Approvals: Ian Maxon: Looks good to me, approved Jenkins: Verified diff --git a/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java b/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java index 28e4202..165f927 100644 --- a/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java +++ b/asterix-algebra/src/main/java/org/apache/asterix/optimizer/rules/ConstantFoldingRule.java @@ -35,7 +35,7 @@ import org.apache.asterix.formats.nontagged.AqlBinaryHashFunctionFactoryProvider; import org.apache.asterix.formats.nontagged.AqlBinaryHashFunctionFamilyProvider; import org.apache.asterix.formats.nontagged.AqlBinaryIntegerInspector; -import org.apache.asterix.formats.nontagged.AqlPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; import org.apache.asterix.jobgen.AqlLogicalExpressionJobGen; @@ -115,7 +115,7 @@ AqlSerializerDeserializerProvider.INSTANCE, AqlBinaryHashFunctionFactoryProvider.INSTANCE, AqlBinaryHashFunctionFamilyProvider.INSTANCE, AqlBinaryComparatorFactoryProvider.INSTANCE, AqlTypeTraitProvider.INSTANCE, AqlBinaryBooleanInspectorImpl.FACTORY, AqlBinaryIntegerInspector.FACTORY, - AqlPrinterFactoryProvider.INSTANCE, AqlNullWriterFactory.INSTANCE, null, + AqlADMPrinterFactoryProvider.INSTANCE, AqlNullWriterFactory.INSTANCE, null, new LogicalExpressionJobGenToExpressionRuntimeProviderAdapter(AqlLogicalExpressionJobGen.INSTANCE), AqlExpressionTypeComputer.INSTANCE, AqlNullableTypeComputer.INSTANCE, null, null, null, null, GlobalConfig.DEFAULT_FRAME_SIZE, null); diff --git a/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java b/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java index 91d8358..db6d041 100644 --- a/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java +++ b/asterix-app/src/main/java/org/apache/asterix/api/common/APIFramework.java @@ -331,7 +331,7 @@ builder.setPrinterProvider(format.getCSVPrinterFactoryProvider()); break; case ADM: - builder.setPrinterProvider(format.getPrinterFactoryProvider()); + builder.setPrinterProvider(format.getADMPrinterFactoryProvider()); break; default: throw new RuntimeException("Unexpected OutputFormat!"); diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryBase64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java similarity index 98% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryBase64Printer.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java index 33f7aad..fd1d595 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryBase64Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryBase64Printer.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryHexPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryHexPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java index f8d742a..d21a17d 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryHexPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryHexPrinter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.asterix.dataflow.data.nontagged.serde.ABinarySerializerDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java index dd776c9..1379154 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABinaryPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABinaryPrinterFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABooleanPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABooleanPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java index 4002b5c..10c2717 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABooleanPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABooleanPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABooleanPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinterFactory.java index 52a5f9b..f29fcd4 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ABooleanPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ABooleanPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ACirclePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ACirclePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java index e782457..ff30c0a 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ACirclePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ACirclePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ACirclePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinterFactory.java index 7e26478..b15f11c 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ACirclePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ACirclePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADatePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADatePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java index 06aedc1..c1f952e 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADatePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADatePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADatePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinterFactory.java index 9635252..8c40fa8 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADatePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADatePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADateTimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADateTimePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java index f0df4b5..b3f60e2 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADateTimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADateTimePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADateTimePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinterFactory.java index 45a74a8..de44bf9 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADateTimePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADateTimePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADayTimeDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java similarity index 97% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADayTimeDurationPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java index 4306b37..59da5d5 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADayTimeDurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADayTimeDurationPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADayTimeDurationPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinterFactory.java index 228afb9..fe26a42 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADayTimeDurationPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADayTimeDurationPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADoublePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADoublePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java index 8545fb5..a94723f 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADoublePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADoublePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADoublePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java index 1aef90c..fc93fa3 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADoublePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADoublePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java similarity index 98% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADurationPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java index e5c7ab6..589626c 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADurationPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADurationPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinterFactory.java index b001a04..d8eda37 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ADurationPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ADurationPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AFloatPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AFloatPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java index 7d0f0b4..e5f2861 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AFloatPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AFloatPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AFloatPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinterFactory.java index 7fa818e..03d91fa 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AFloatPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AFloatPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt16Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java similarity index 97% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt16Printer.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java index 4dbc571..9076750 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt16Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16Printer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.DataOutput; import java.io.DataOutputStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt16PrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16PrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt16PrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16PrinterFactory.java index cc4d86a..c0f5561 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt16PrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt16PrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt32Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java similarity index 97% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt32Printer.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java index d5701cc..036d16d 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt32Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32Printer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.DataOutput; import java.io.DataOutputStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt32PrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32PrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt32PrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32PrinterFactory.java index eed82db..612e549 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt32PrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt32PrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt64Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt64Printer.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java index 4859bb1..8401889 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt64Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64Printer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt64PrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64PrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt64PrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64PrinterFactory.java index 6346973..da44b03 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt64PrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt64PrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt8Printer.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java similarity index 97% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt8Printer.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java index 6185b30..38eb91e 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt8Printer.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8Printer.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.DataOutput; import java.io.DataOutputStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt8PrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8PrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt8PrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8PrinterFactory.java index 1f8f7c4..3fc67ab 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AInt8PrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AInt8PrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AIntervalPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java similarity index 97% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AIntervalPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java index d0cd4a2..1c0adc6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AIntervalPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AIntervalPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AIntervalPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinterFactory.java index e2b4f34..95dd10d 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AIntervalPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AIntervalPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ALinePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ALinePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java index a0ac846..734c850 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ALinePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ALinePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ALinePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinterFactory.java index 2feee5a..67993fb 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ALinePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ALinePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java index 8db53cd..95de99e 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinterFactory.java index d88b70c..a9b9a0c 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullableFieldPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java similarity index 84% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullableFieldPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java index e08f1c1..a125956 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ANullableFieldPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ANullableFieldPrinterFactory.java @@ -16,11 +16,11 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; -import org.apache.asterix.formats.nontagged.AqlPrinterFactoryProvider; +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; @@ -46,8 +46,8 @@ @Override public void init() throws AlgebricksException { - nullPrinter = (AqlPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)).createPrinter(); - fieldPrinter = (AqlPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getNullableType())) + nullPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(BuiltinType.ANULL)).createPrinter(); + fieldPrinter = (AqlADMPrinterFactoryProvider.INSTANCE.getPrinterFactory(unionType.getNullableType())) .createPrinter(); } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AObjectPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java similarity index 98% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AObjectPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java index fd8bae6..6a3d61d 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AObjectPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AObjectPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AObjectPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java index 4f93f96..1812ae3 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AObjectPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AObjectPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AOrderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AOrderedlistPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java index e832016..2ddd652 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AOrderedlistPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AOrderedlistPrinterFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; import org.apache.asterix.om.pointables.PointableAllocator; import org.apache.asterix.om.pointables.base.DefaultOpenFieldType; import org.apache.asterix.om.pointables.base.IVisitablePointable; -import org.apache.asterix.om.pointables.printer.APrintVisitor; +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; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APoint3DPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APoint3DPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java index 8d53973..ff7b452 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APoint3DPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APoint3DPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APoint3DPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinterFactory.java index c83d634..351a227 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APoint3DPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APoint3DPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APointPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APointPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java index fd8d003..2a2ba08 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APointPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APointPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APointPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinterFactory.java index c40591e..1d17ed0 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APointPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APointPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APolygonPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APolygonPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java index 62085ec..c5a7b85 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APolygonPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APolygonPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APolygonPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinterFactory.java index 623956c..93a6cf6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/APolygonPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/APolygonPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARecordPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARecordPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java index 8c808f2..06cce73 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARecordPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARecordPrinterFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; import org.apache.asterix.om.pointables.PointableAllocator; import org.apache.asterix.om.pointables.base.DefaultOpenFieldType; import org.apache.asterix.om.pointables.base.IVisitablePointable; -import org.apache.asterix.om.pointables.printer.APrintVisitor; +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; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARectanglePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARectanglePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java index 24d8a6a..2c488ad 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARectanglePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARectanglePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARectanglePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinterFactory.java index 5b85dc7..7be06d4 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ARectanglePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ARectanglePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AStringPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AStringPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java index e776b8e..c767330 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AStringPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AStringPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AStringPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinterFactory.java index 117807e..0621e50 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AStringPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AStringPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ATimePrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ATimePrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java index 7921fa3..06861a6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ATimePrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ATimePrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ATimePrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinterFactory.java index 7aa3b4e..c776dab 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ATimePrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ATimePrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUUIDPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java similarity index 96% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUUIDPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java index 917cd42..c1b6b81 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUUIDPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUUIDPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUUIDPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinterFactory.java index cf8ec8d..eeed0b8 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUUIDPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUUIDPrinterFactory.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUnionPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java similarity index 92% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUnionPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java index 5a86537..5d4f450 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUnionPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnionPrinterFactory.java @@ -16,12 +16,12 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; import java.util.List; -import org.apache.asterix.formats.nontagged.AqlPrinterFactoryProvider; +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; @@ -52,7 +52,7 @@ unionList = unionType.getUnionList(); printers = new IPrinter[unionType.getUnionList().size()]; for (int i = 0; i < printers.length; i++) { - printers[i] = (AqlPrinterFactoryProvider.INSTANCE + printers[i] = (AqlADMPrinterFactoryProvider.INSTANCE .getPrinterFactory(unionType.getUnionList().get(i))).createPrinter(); printers[i].init(); } diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUnorderedlistPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUnorderedlistPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java index efd0d5a..fa586db 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AUnorderedlistPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AUnorderedlistPrinterFactory.java @@ -16,14 +16,14 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.PrintStream; import org.apache.asterix.om.pointables.PointableAllocator; import org.apache.asterix.om.pointables.base.DefaultOpenFieldType; import org.apache.asterix.om.pointables.base.IVisitablePointable; -import org.apache.asterix.om.pointables.printer.APrintVisitor; +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; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AYearMonthDurationPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java similarity index 97% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AYearMonthDurationPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java index c3d00fc..d91eb17 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AYearMonthDurationPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AYearMonthDurationPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinterFactory.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AYearMonthDurationPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinterFactory.java index c898f6f..ff16fb7 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/AYearMonthDurationPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/AYearMonthDurationPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; 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/adm/PrintTools.java similarity index 98% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/PrintTools.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/PrintTools.java index 8b71ba8..395bfd8 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/adm/PrintTools.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.OutputStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ShortWithoutTypeInfoPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java similarity index 95% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ShortWithoutTypeInfoPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java index 99ede4e..ec3ee38 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ShortWithoutTypeInfoPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinter.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ShortWithoutTypeInfoPrinterFactory.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinterFactory.java similarity index 94% rename from asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ShortWithoutTypeInfoPrinterFactory.java rename to asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinterFactory.java index 3d7042c..ec93417 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/ShortWithoutTypeInfoPrinterFactory.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/adm/ShortWithoutTypeInfoPrinterFactory.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.asterix.dataflow.data.nontagged.printers; +package org.apache.asterix.dataflow.data.nontagged.printers.adm; import org.apache.hyracks.algebricks.data.IPrinter; import org.apache.hyracks.algebricks.data.IPrinterFactory; 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..c88efe4 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 @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.PrintStream; -import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.PrintTools; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AObjectPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AObjectPrinter.java index 4247841..faf21a3 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AObjectPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AObjectPrinter.java @@ -20,7 +20,7 @@ import java.io.PrintStream; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryHexPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryHexPrinter; import org.apache.asterix.om.types.ATypeTag; import org.apache.asterix.om.types.EnumDeserializer; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; diff --git a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AStringPrinter.java b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AStringPrinter.java index c5fb80c6..bd19b66 100644 --- a/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AStringPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/dataflow/data/nontagged/printers/json/AStringPrinter.java @@ -21,7 +21,7 @@ import java.io.IOException; import java.io.PrintStream; -import org.apache.asterix.dataflow.data.nontagged.printers.PrintTools; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.PrintTools; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.algebricks.data.IPrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/base/IDataFormat.java b/asterix-om/src/main/java/org/apache/asterix/formats/base/IDataFormat.java index f5e8ab0..ffbcd20 100644 --- a/asterix-om/src/main/java/org/apache/asterix/formats/base/IDataFormat.java +++ b/asterix-om/src/main/java/org/apache/asterix/formats/base/IDataFormat.java @@ -61,7 +61,7 @@ public IBinaryIntegerInspectorFactory getBinaryIntegerInspectorFactory(); // QQQ Refactor: Make this accept an APIFramework.OutputFormat parameter - public IPrinterFactoryProvider getPrinterFactoryProvider(); + public IPrinterFactoryProvider getADMPrinterFactoryProvider(); public IPrinterFactoryProvider getJSONPrinterFactoryProvider(); diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java similarity index 63% rename from asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java rename to asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java index 04e7b38..19174f6 100644 --- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlPrinterFactoryProvider.java +++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlADMPrinterFactoryProvider.java @@ -18,37 +18,37 @@ */ package org.apache.asterix.formats.nontagged; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ABooleanPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ACirclePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ADatePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ADateTimePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ADayTimeDurationPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ADoublePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ADurationPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AFloatPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt16PrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt32PrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt64PrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt8PrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AIntervalPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ALinePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ANullPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ANullableFieldPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AObjectPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AOrderedlistPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.APoint3DPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.APointPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.APolygonPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ARecordPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ARectanglePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AStringPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ATimePrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AUnionPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AUnorderedlistPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AYearMonthDurationPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABooleanPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ACirclePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADatePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADateTimePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADayTimeDurationPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADoublePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADurationPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AFloatPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt16PrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt32PrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt64PrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt8PrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AIntervalPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ALinePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ANullPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ANullableFieldPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AObjectPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AOrderedlistPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.APoint3DPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.APointPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.APolygonPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ARecordPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ARectanglePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AStringPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ATimePrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUUIDPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUnionPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUnorderedlistPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AYearMonthDurationPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ShortWithoutTypeInfoPrinterFactory; import org.apache.asterix.om.types.AOrderedListType; import org.apache.asterix.om.types.ARecordType; import org.apache.asterix.om.types.AUnionType; @@ -58,11 +58,11 @@ import org.apache.hyracks.algebricks.data.IPrinterFactory; import org.apache.hyracks.algebricks.data.IPrinterFactoryProvider; -public class AqlPrinterFactoryProvider implements IPrinterFactoryProvider { +public class AqlADMPrinterFactoryProvider implements IPrinterFactoryProvider { - public static final AqlPrinterFactoryProvider INSTANCE = new AqlPrinterFactoryProvider(); + public static final AqlADMPrinterFactoryProvider INSTANCE = new AqlADMPrinterFactoryProvider(); - private AqlPrinterFactoryProvider() { + private AqlADMPrinterFactoryProvider() { } @Override 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 ce3c101..f4c8156 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 @@ -18,8 +18,8 @@ */ package org.apache.asterix.formats.nontagged; -import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUUIDPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ShortWithoutTypeInfoPrinterFactory; import org.apache.asterix.dataflow.data.nontagged.printers.csv.ABooleanPrinterFactory; import org.apache.asterix.dataflow.data.nontagged.printers.csv.ACirclePrinterFactory; import org.apache.asterix.dataflow.data.nontagged.printers.csv.ADatePrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlJSONPrinterFactoryProvider.java b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlJSONPrinterFactoryProvider.java index 2f7f8dd..96dcbb5 100644 --- a/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlJSONPrinterFactoryProvider.java +++ b/asterix-om/src/main/java/org/apache/asterix/formats/nontagged/AqlJSONPrinterFactoryProvider.java @@ -18,9 +18,9 @@ */ package org.apache.asterix.formats.nontagged; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinterFactory; -import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUUIDPrinterFactory; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ShortWithoutTypeInfoPrinterFactory; import org.apache.asterix.dataflow.data.nontagged.printers.json.ABooleanPrinterFactory; import org.apache.asterix.dataflow.data.nontagged.printers.json.ACirclePrinterFactory; import org.apache.asterix.dataflow.data.nontagged.printers.json.ADatePrinterFactory; diff --git a/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java b/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java index af7e646..ab80f4f 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/pointables/cast/ARecordCaster.java @@ -35,7 +35,7 @@ import org.apache.asterix.om.pointables.PointableAllocator; import org.apache.asterix.om.pointables.base.DefaultOpenFieldType; import org.apache.asterix.om.pointables.base.IVisitablePointable; -import org.apache.asterix.om.pointables.printer.APrintVisitor; +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.AUnionType; diff --git a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/AListPrinter.java b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/AListPrinter.java similarity index 98% rename from asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/AListPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/AListPrinter.java index 40dd6eb..c5964b4 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/AListPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/AListPrinter.java @@ -17,7 +17,7 @@ * under the License. */ -package org.apache.asterix.om.pointables.printer; +package org.apache.asterix.om.pointables.printer.adm; import java.io.IOException; import java.io.PrintStream; diff --git a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/APrintVisitor.java b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java similarity index 78% rename from asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/APrintVisitor.java rename to asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java index c767026..d4f8652 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/APrintVisitor.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/APrintVisitor.java @@ -17,38 +17,34 @@ * under the License. */ -package org.apache.asterix.om.pointables.printer; - -import java.io.PrintStream; -import java.util.HashMap; -import java.util.Map; +package org.apache.asterix.om.pointables.printer.adm; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryHexPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ABooleanPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ACirclePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ADatePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ADateTimePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ADayTimeDurationPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ADoublePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ADurationPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.AFloatPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt16Printer; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt32Printer; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt64Printer; -import org.apache.asterix.dataflow.data.nontagged.printers.AInt8Printer; -import org.apache.asterix.dataflow.data.nontagged.printers.AIntervalPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ALinePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ANullPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.APoint3DPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.APointPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.APolygonPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ARectanglePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.AStringPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ATimePrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.AYearMonthDurationPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryHexPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABooleanPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ACirclePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADatePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADateTimePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADayTimeDurationPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADoublePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ADurationPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AFloatPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt16Printer; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt32Printer; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt64Printer; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AInt8Printer; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AIntervalPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ALinePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ANullPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.APoint3DPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.APointPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.APolygonPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ARectanglePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AStringPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ATimePrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUUIDPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AYearMonthDurationPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ShortWithoutTypeInfoPrinter; import org.apache.asterix.om.pointables.AFlatValuePointable; import org.apache.asterix.om.pointables.AListVisitablePointable; import org.apache.asterix.om.pointables.ARecordVisitablePointable; @@ -58,6 +54,10 @@ import org.apache.hyracks.algebricks.common.exceptions.NotImplementedException; import org.apache.hyracks.algebricks.common.utils.Pair; +import java.io.PrintStream; +import java.util.HashMap; +import java.util.Map; + /** * This class is a IVisitablePointableVisitor implementation which recursively * visit a given record, list or flat value of a given type, and print it to a diff --git a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/ARecordPrinter.java similarity index 98% rename from asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java rename to asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/ARecordPrinter.java index 99aec0e..4cbcf71 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/ARecordPrinter.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/adm/ARecordPrinter.java @@ -17,11 +17,7 @@ * under the License. */ -package org.apache.asterix.om.pointables.printer; - -import java.io.IOException; -import java.io.PrintStream; -import java.util.List; +package org.apache.asterix.om.pointables.printer.adm; import org.apache.asterix.common.exceptions.AsterixException; import org.apache.asterix.om.pointables.ARecordVisitablePointable; @@ -30,6 +26,10 @@ import org.apache.asterix.om.types.EnumDeserializer; import org.apache.hyracks.algebricks.common.utils.Pair; +import java.io.IOException; +import java.io.PrintStream; +import java.util.List; + /** * This class is to print the content of a record. It is ONLY visible to * APrintVisitor. diff --git a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java index 8f21fb4..378be33 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/csv/APrintVisitor.java @@ -24,8 +24,8 @@ import java.util.Map; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUUIDPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ShortWithoutTypeInfoPrinter; import org.apache.asterix.dataflow.data.nontagged.printers.csv.ABooleanPrinter; import org.apache.asterix.dataflow.data.nontagged.printers.csv.ACirclePrinter; import org.apache.asterix.dataflow.data.nontagged.printers.csv.ADatePrinter; diff --git a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/APrintVisitor.java b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/APrintVisitor.java index 89005d0..b459138 100644 --- a/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/APrintVisitor.java +++ b/asterix-om/src/main/java/org/apache/asterix/om/pointables/printer/json/APrintVisitor.java @@ -24,9 +24,9 @@ import java.util.Map; import org.apache.asterix.common.exceptions.AsterixException; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryHexPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.AUUIDPrinter; -import org.apache.asterix.dataflow.data.nontagged.printers.ShortWithoutTypeInfoPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryHexPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.AUUIDPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ShortWithoutTypeInfoPrinter; import org.apache.asterix.dataflow.data.nontagged.printers.json.ABooleanPrinter; import org.apache.asterix.dataflow.data.nontagged.printers.json.ACirclePrinter; import org.apache.asterix.dataflow.data.nontagged.printers.json.ADatePrinter; 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 b3aa9de..f43890c 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 @@ -19,6 +19,7 @@ package org.apache.asterix.dataflow.data.nontagged.printers; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryHexPrinter; import org.apache.hyracks.algebricks.common.exceptions.AlgebricksException; import org.apache.hyracks.data.std.primitive.ByteArrayPointable; import org.junit.Test; diff --git a/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/PrintBinaryDescriptor.java b/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/PrintBinaryDescriptor.java index 23fcacc..07cc44d 100644 --- a/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/PrintBinaryDescriptor.java +++ b/asterix-runtime/src/main/java/org/apache/asterix/runtime/evaluators/functions/binary/PrintBinaryDescriptor.java @@ -19,8 +19,8 @@ package org.apache.asterix.runtime.evaluators.functions.binary; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryBase64Printer; -import org.apache.asterix.dataflow.data.nontagged.printers.ABinaryHexPrinter; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryBase64Printer; +import org.apache.asterix.dataflow.data.nontagged.printers.adm.ABinaryHexPrinter; import org.apache.asterix.om.functions.AsterixBuiltinFunctions; import org.apache.asterix.om.functions.IFunctionDescriptor; import org.apache.asterix.om.functions.IFunctionDescriptorFactory; diff --git a/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java b/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java index dd30697..1ccdf94 100644 --- a/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java +++ b/asterix-runtime/src/main/java/org/apache/asterix/runtime/formats/NonTaggedDataFormat.java @@ -32,7 +32,7 @@ import org.apache.asterix.formats.nontagged.AqlJSONPrinterFactoryProvider; import org.apache.asterix.formats.nontagged.AqlNormalizedKeyComputerFactoryProvider; import org.apache.asterix.formats.nontagged.AqlPredicateEvaluatorFactoryProvider; -import org.apache.asterix.formats.nontagged.AqlPrinterFactoryProvider; +import org.apache.asterix.formats.nontagged.AqlADMPrinterFactoryProvider; import org.apache.asterix.formats.nontagged.AqlSerializerDeserializerProvider; import org.apache.asterix.formats.nontagged.AqlTypeTraitProvider; import org.apache.asterix.om.base.ABoolean; @@ -1053,8 +1053,8 @@ } @Override - public IPrinterFactoryProvider getPrinterFactoryProvider() { - return AqlPrinterFactoryProvider.INSTANCE; + public IPrinterFactoryProvider getADMPrinterFactoryProvider() { + return AqlADMPrinterFactoryProvider.INSTANCE; } @Override -- To view, visit https://asterix-gerrit.ics.uci.edu/360 To unsubscribe, visit https://asterix-gerrit.ics.uci.edu/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5c37d3b5aad7f286eba1cb8cb5f05ad456a6521b Gerrit-PatchSet: 7 Gerrit-Project: asterixdb Gerrit-Branch: master Gerrit-Owner: Chris Hillery <[email protected]> Gerrit-Reviewer: Chris Hillery <[email protected]> Gerrit-Reviewer: Ian Maxon <[email protected]> Gerrit-Reviewer: Jenkins <[email protected]>
