AJ-743: add 'getScale' method for Matrix;

chengyitian · chengyitian · commit 33db5b3d6651 · 2024-07-04T16:56:55.000+08:00
diff --git a/src/com/xxdb/data/AbstractMatrix.java b/src/com/xxdb/data/AbstractMatrix.java
@@ -237,4 +237,9 @@ public void write(ExtendedDataOutput out) throws IOException{
 		out.writeInt(columns());
 		writeVectorToOutputStream(out);
 	}
+
+	@Override
+	public int getScale(){
+		throw new RuntimeException("Not suppprt");
+	}
 }
diff --git a/src/com/xxdb/data/BasicBooleanMatrix.java b/src/com/xxdb/data/BasicBooleanMatrix.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 
@@ -92,4 +92,10 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 		for(byte value : values)
 			out.writeByte(value);
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicByteMatrix.java b/src/com/xxdb/data/BasicByteMatrix.java
@@ -2,7 +2,7 @@
 
 import java.io.IOException;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 
@@ -92,4 +92,9 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 			out.writeByte(value);
 	}
 
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicComplexMatrix.java b/src/com/xxdb/data/BasicComplexMatrix.java
@@ -4,7 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.Double2;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
@@ -94,4 +94,10 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 		for(Double2 value : values)
 			out.writeDouble2(value);
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicDateHourMatrix.java b/src/com/xxdb/data/BasicDateHourMatrix.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 
 /**
@@ -52,4 +52,10 @@ public DATA_CATEGORY getDataCategory() {
 	public DATA_TYPE getDataType() {
 		return DATA_TYPE.DT_DATEHOUR;
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicDateMatrix.java b/src/com/xxdb/data/BasicDateMatrix.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.time.LocalDate;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 
 /**
@@ -53,4 +53,10 @@ public DATA_CATEGORY getDataCategory() {
 	public DATA_TYPE getDataType() {
 		return DATA_TYPE.DT_DATE;
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicDateTimeMatrix.java b/src/com/xxdb/data/BasicDateTimeMatrix.java
@@ -3,7 +3,7 @@
 import java.io.IOException;
 import java.time.LocalDateTime;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 
 /**
@@ -52,4 +52,10 @@ public DATA_CATEGORY getDataCategory() {
 	public DATA_TYPE getDataType() {
 		return DATA_TYPE.DT_DATETIME;
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicDecimal128Matrix.java b/src/com/xxdb/data/BasicDecimal128Matrix.java
@@ -1,5 +1,6 @@
 package com.xxdb.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 import java.io.IOException;
@@ -130,6 +131,8 @@ public void setScale(int scale) {
         this.scale = scale;
     }
 
+    @JsonIgnore
+    @Override
     public int getScale() {
         return this.scale;
     }
diff --git a/src/com/xxdb/data/BasicDecimal32Matrix.java b/src/com/xxdb/data/BasicDecimal32Matrix.java
@@ -1,5 +1,6 @@
 package com.xxdb.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 import java.io.IOException;
@@ -114,6 +115,8 @@ public void setScale(int scale) {
         this.scale = scale;
     }
 
+    @JsonIgnore
+    @Override
     public int getScale() {
         return this.scale;
     }
diff --git a/src/com/xxdb/data/BasicDecimal64Matrix.java b/src/com/xxdb/data/BasicDecimal64Matrix.java
@@ -1,5 +1,6 @@
 package com.xxdb.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 import java.io.IOException;
@@ -124,6 +125,8 @@ public void setScale(int scale) {
         this.scale = scale;
     }
 
+    @JsonIgnore
+    @Override
     public int getScale() {
         return this.scale;
     }
diff --git a/src/com/xxdb/data/BasicDoubleMatrix.java b/src/com/xxdb/data/BasicDoubleMatrix.java
@@ -4,7 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 
@@ -98,4 +98,10 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 		for(double value : values)
 			out.writeDouble(value);
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicFloatMatrix.java b/src/com/xxdb/data/BasicFloatMatrix.java
@@ -4,7 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 
@@ -98,4 +98,10 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 		for(float value : values)
 			out.writeFloat(value);
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicIntMatrix.java b/src/com/xxdb/data/BasicIntMatrix.java
@@ -4,7 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 
@@ -98,4 +98,10 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 		for(int value : values)
 			out.writeInt(value);
 	}
+
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/BasicLongMatrix.java b/src/com/xxdb/data/BasicLongMatrix.java
@@ -4,7 +4,7 @@
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.List;
-
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.xxdb.io.ExtendedDataInput;
 import com.xxdb.io.ExtendedDataOutput;
 
@@ -99,4 +99,9 @@ protected void writeVectorToOutputStream(ExtendedDataOutput out) throws IOExcept
 			out.writeLong(value);
 	}
 
+	@JsonIgnore
+	@Override
+	public int getScale() {
+		return super.getScale();
+	}
 }
diff --git a/src/com/xxdb/data/Matrix.java b/src/com/xxdb/data/Matrix.java
@@ -17,4 +17,5 @@ public interface Matrix extends Entity{
 	boolean hasRowLabel();
 	boolean hasColumnLabel();
 	Class<?> getElementClass();
+	int getScale();
 }

Original file line number	Diff line number	Diff line change
`@@ -237,4 +237,9 @@ public void write(ExtendedDataOutput out) throws IOException{`
`237`	`237`	`out.writeInt(columns());`
`238`	`238`	`writeVectorToOutputStream(out);`
`239`	`239`	`}`
	`240`	`+`
	`241`	`+ @Override`
	`242`	`+ public int getScale(){`
	`243`	`+ throw new RuntimeException("Not suppprt");`
	`244`	`+ }`
`240`	`245`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`package com.xxdb.data;`
`2`	`2`
	`3`	`+import com.fasterxml.jackson.annotation.JsonIgnore;`
`3`	`4`	`import com.xxdb.io.ExtendedDataInput;`
`4`	`5`	`import com.xxdb.io.ExtendedDataOutput;`
`5`	`6`	`import java.io.IOException;`
`@@ -130,6 +131,8 @@ public void setScale(int scale) {`
`130`	`131`	`this.scale = scale;`
`131`	`132`	`}`
`132`	`133`
	`134`	`+ @JsonIgnore`
	`135`	`+ @Override`
`133`	`136`	`public int getScale() {`
`134`	`137`	`return this.scale;`
`135`	`138`	`}`