Skip to content

Implement DECIMAL type and remove DOUBLE type to conform with TPCH spec #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
atris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement DECIMAL type and remove DOUBLE type to conform with TPCH spec #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/io/airlift/tpch/CustomerColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package io.airlift.tpch;

import static io.airlift.tpch.TpchColumnTypes.IDENTIFIER;
import static io.airlift.tpch.TpchColumnTypes.DOUBLE;
import static io.airlift.tpch.TpchColumnTypes.DECIMAL;
import static io.airlift.tpch.TpchColumnTypes.varchar;

public enum CustomerColumn
Expand Down Expand Up @@ -60,7 +60,7 @@ public String getString(Customer customer)
}
},

ACCOUNT_BALANCE("c_acctbal", DOUBLE)
ACCOUNT_BALANCE("c_acctbal", DECIMAL)
{
public double getDouble(Customer customer)
{
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/io/airlift/tpch/LineItemColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import static io.airlift.tpch.GenerateUtils.formatDate;
import static io.airlift.tpch.TpchColumnTypes.IDENTIFIER;
import static io.airlift.tpch.TpchColumnTypes.DATE;
import static io.airlift.tpch.TpchColumnTypes.DOUBLE;
import static io.airlift.tpch.TpchColumnTypes.DECIMAL;
import static io.airlift.tpch.TpchColumnTypes.INTEGER;
import static io.airlift.tpch.TpchColumnTypes.varchar;

Expand Down Expand Up @@ -59,7 +59,7 @@ public int getInteger(LineItem lineItem)
}
},

QUANTITY("l_quantity", DOUBLE)
QUANTITY("l_quantity", DECIMAL)
{
public double getDouble(LineItem lineItem)
{
Expand All @@ -73,7 +73,7 @@ public long getIdentifier(LineItem lineItem)
},

@SuppressWarnings("SpellCheckingInspection")
EXTENDED_PRICE("l_extendedprice", DOUBLE)
EXTENDED_PRICE("l_extendedprice", DECIMAL)
{
public double getDouble(LineItem lineItem)
{
Expand All @@ -86,7 +86,7 @@ public long getIdentifier(LineItem lineItem)
}
},

DISCOUNT("l_discount", DOUBLE)
DISCOUNT("l_discount", DECIMAL)
{
public double getDouble(LineItem lineItem)
{
Expand All @@ -99,7 +99,7 @@ public long getIdentifier(LineItem lineItem)
}
},

TAX("l_tax", DOUBLE)
TAX("l_tax", DECIMAL)
{
public double getDouble(LineItem lineItem)
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/airlift/tpch/OrderColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
import static io.airlift.tpch.GenerateUtils.formatDate;
import static io.airlift.tpch.TpchColumnTypes.IDENTIFIER;
import static io.airlift.tpch.TpchColumnTypes.DATE;
import static io.airlift.tpch.TpchColumnTypes.DOUBLE;
import static io.airlift.tpch.TpchColumnTypes.DECIMAL;
import static io.airlift.tpch.TpchColumnTypes.INTEGER;
import static io.airlift.tpch.TpchColumnTypes.varchar;

Expand Down Expand Up @@ -51,7 +51,7 @@ public String getString(Order order)
},

@SuppressWarnings("SpellCheckingInspection")
TOTAL_PRICE("o_totalprice", DOUBLE)
TOTAL_PRICE("o_totalprice", DECIMAL)
{
public double getDouble(Order order)
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/airlift/tpch/PartColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package io.airlift.tpch;

import static io.airlift.tpch.TpchColumnTypes.IDENTIFIER;
import static io.airlift.tpch.TpchColumnTypes.DOUBLE;
import static io.airlift.tpch.TpchColumnTypes.DECIMAL;
import static io.airlift.tpch.TpchColumnTypes.INTEGER;
import static io.airlift.tpch.TpchColumnTypes.varchar;

Expand Down Expand Up @@ -79,7 +79,7 @@ public String getString(Part part)
},

@SuppressWarnings("SpellCheckingInspection")
RETAIL_PRICE("p_retailprice", DOUBLE)
RETAIL_PRICE("p_retailprice", DECIMAL)
{
public double getDouble(Part part)
Copy link
Copy Markdown
Member

@kokosing kokosing Aug 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this method needed? I would expect getLong here.

Copy link
Copy Markdown
Author

@atris atris Aug 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left the method here for completeness sake. Do you want to remove getDouble from here?

{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/airlift/tpch/PartSupplierColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package io.airlift.tpch;

import static io.airlift.tpch.TpchColumnTypes.IDENTIFIER;
import static io.airlift.tpch.TpchColumnTypes.DOUBLE;
import static io.airlift.tpch.TpchColumnTypes.DECIMAL;
import static io.airlift.tpch.TpchColumnTypes.INTEGER;
import static io.airlift.tpch.TpchColumnTypes.varchar;

Expand Down Expand Up @@ -49,7 +49,7 @@ public int getInteger(PartSupplier partSupplier)
},

@SuppressWarnings("SpellCheckingInspection")
SUPPLY_COST("ps_supplycost", DOUBLE)
SUPPLY_COST("ps_supplycost", DECIMAL)
{
public double getDouble(PartSupplier partSupplier)
{
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/io/airlift/tpch/SupplierColumn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
package io.airlift.tpch;

import static io.airlift.tpch.TpchColumnTypes.IDENTIFIER;
import static io.airlift.tpch.TpchColumnTypes.DOUBLE;
import static io.airlift.tpch.TpchColumnTypes.DECIMAL;
import static io.airlift.tpch.TpchColumnTypes.varchar;

public enum SupplierColumn
Expand Down Expand Up @@ -63,7 +63,7 @@ public String getString(Supplier supplier)
},

@SuppressWarnings("SpellCheckingInspection")
ACCOUNT_BALANCE("s_acctbal", DOUBLE)
ACCOUNT_BALANCE("s_acctbal", DECIMAL)
{
public double getDouble(Supplier supplier)
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/airlift/tpch/TpchColumnType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public enum Base {
INTEGER,
IDENTIFIER,
DATE,
DOUBLE,
DECIMAL,
Copy link
Copy Markdown
Member

@kokosing kokosing Aug 1, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add a comment that it precision = 2

VARCHAR
}

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/io/airlift/tpch/TpchColumnTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ private TpchColumnTypes() {}
public static final TpchColumnType INTEGER = new TpchColumnType(TpchColumnType.Base.INTEGER);
public static final TpchColumnType IDENTIFIER = new TpchColumnType(TpchColumnType.Base.IDENTIFIER);
public static final TpchColumnType DATE = new TpchColumnType(TpchColumnType.Base.DATE);
public static final TpchColumnType DOUBLE = new TpchColumnType(TpchColumnType.Base.DOUBLE);
public static final TpchColumnType DECIMAL = new TpchColumnType(TpchColumnType.Base.DECIMAL);

public static TpchColumnType varchar(long precision) {
return new TpchColumnType(TpchColumnType.Base.VARCHAR, precision);
Expand Down